Merge new MultiPlayerSetup and autojoin

SQF/dayz_code/Configs/CfgPlayerStats/p__cover.hpp

@@ -40,6 +40,7 @@ class horde_journal_front_cover
 	};
 	
 	// buttons
+	
 	class open_craft: RscIGUIShortcutButton {
 		idc = -1;
 		x = 0.48 * safezoneW + safezoneX;
@@ -47,6 +48,16 @@ class horde_journal_front_cover
 		text = $STR_UI_CRAFT_OPEN;
 		action = "closeDialog 0; createDialog 'RscDisplayCraftingMenu';";
 	};
+	/*
+	class open_Construction: RscIGUIShortcutButton {
+		idc = -1;
+		x = 0.48 * safezoneW + safezoneX;
+		y = 0.85 * safezoneH + safezoneY;
+		text = "Construction";
+		action = "closeDialog 0; createDialog 'RscDisplayConstructionMenu';";
+	};
+	*/
+	
 	class open_book: horde_RscButton
 	{
 		idc = 1900;

SQF/dayz_code/Configs/CfgVehicles/Bags.hpp

@@ -20,8 +20,9 @@ class Bag_Base_EP1 : ReammoBox_EP1 {
 
 class DZ_Patrol_Pack_EP1: Bag_Base_EP1
 {
-	scope = public;
+	scope = 2;
-	displayName = $STR_EPOCH_PACK_PATROL;
+	displayName = $STR_BACKPACK_NAME_PATROL;
+	descriptionShort = $STR_BACKPACK_DESC_PATROL;
 	picture = "\ca\weapons_e\data\icons\backpack_US_ASSAULT_COYOTE_CA.paa";
 	icon = "\ca\weapons_e\data\icons\mapIcon_backpack_CA.paa";
 	mapsize = 2;
@@ -36,8 +37,9 @@ class DZ_Patrol_Pack_EP1: Bag_Base_EP1
 
 class DZ_Assault_Pack_EP1: Bag_Base_EP1
 {
-	scope = public;
+	scope = 2;
-	displayName = $STR_EPOCH_PACK_ASSAULT;
+	displayName = $STR_BACKPACK_NAME_ACU;
+	descriptionShort = $STR_BACKPACK_DESC_ACU;
 	picture = "\ca\weapons_e\data\icons\backpack_US_ASSAULT_CA.paa";
 	icon = "\ca\weapons_e\data\icons\mapIcon_backpack_CA.paa";
 	mapSize = 2;
@@ -47,29 +49,31 @@ class DZ_Assault_Pack_EP1: Bag_Base_EP1
 	class eventHandlers
 	{
 		init="[(_this select 0),'CfgVehicles','DZ_Assault_Pack_EP1'] execVM '\z\addons\dayz_code\init\object_BackpackAction.sqf';";
-	};
+	};	
 };
 
 class DZ_Czech_Vest_Puch: Bag_Base_EP1
 {
-	displayname = $STR_EPOCH_PACK_POUCH;
+	displayname = $STR_BACKPACK_NAME_VEST;
+	descriptionShort = $STR_BACKPACK_DESC_VEST;
 	icon = "\ca\weapons_e\data\icons\mapIcon_backpack_CA.paa";
 	mapsize = 2;
 	model = "\ca\weapons_e\AmmoBoxes\backpack_acr_small.p3d";
 	picture = "\ca\weapons_e\data\icons\backpack_ACR_small_CA.paa";
-	scope = public;
+	scope = 2;
 	transportmaxmagazines = 12;
 	transportmaxweapons = 0;
 	class eventHandlers
 	{
 		init="[(_this select 0),'CfgVehicles','DZ_Czech_Vest_Puch'] execVM '\z\addons\dayz_code\init\object_BackpackAction.sqf';";
-	};
+	};	
 };
 
 class DZ_ALICE_Pack_EP1: Bag_Base_EP1
 {
-	scope = public;
+	scope = 2;
-	displayName = $STR_EPOCH_PACK_ALICE;
+	displayName = $STR_BACKPACK_NAME_ALICE;
+	descriptionShort = $STR_BACKPACK_DESC_ALICE;
 	picture = "\ca\weapons_e\data\icons\backpack_TK_ALICE_CA.paa";
 	icon = "\ca\weapons_e\data\icons\mapIcon_backpack_CA.paa";
 	mapsize = 2;
@@ -79,13 +83,14 @@ class DZ_ALICE_Pack_EP1: Bag_Base_EP1
 	class eventHandlers
 	{
 		init="[(_this select 0),'CfgVehicles','DZ_ALICE_Pack_EP1'] execVM '\z\addons\dayz_code\init\object_BackpackAction.sqf';";
-	};
+	};	
 };
 
 class DZ_TK_Assault_Pack_EP1 : Bag_Base_EP1
 {
-	scope = public;
+	scope = 2;
-	displayName = $STR_EPOCH_PACK_ACU;
+	displayName = $STR_BACKPACK_NAME_SURVACU;
+	descriptionShort = $STR_BACKPACK_DESC_SURVACU;
 	mapSize = 2;
 	picture = "\ca\weapons_e\data\icons\backpack_CIVIL_ASSAULT_CA.paa";
 	icon = "\ca\weapons_e\data\icons\mapIcon_backpack_CA.paa";
@@ -95,15 +100,16 @@ class DZ_TK_Assault_Pack_EP1 : Bag_Base_EP1
 	class eventHandlers
 	{
 		init="[(_this select 0),'CfgVehicles','DZ_TK_Assault_Pack_EP1'] execVM '\z\addons\dayz_code\init\object_BackpackAction.sqf';";
-	};
+	};	
 };
 
 class DZ_British_ACU : Bag_Base_EP1
 {
-	scope = public;
+	scope = 2;
-	displayName = $STR_EPOCH_PACK_BAP;
+	displayName = $STR_BACKPACK_NAME_BRITISH;
+	descriptionShort = $STR_BACKPACK_DESC_BRITISH;
 	mapSize = 2;
-	model = "\ca\weapons_baf\Backpack_Small_BAF";\
+	model = "\ca\weapons_baf\Backpack_Small_BAF";
 	picture = "\ca\weapons_baf\data\UI\backpack_BAF_CA.paa";
 	icon = "\ca\weapons_e\data\icons\mapIcon_backpack_CA.paa";
 	transportMaxWeapons = 3;
@@ -111,13 +117,14 @@ class DZ_British_ACU : Bag_Base_EP1
 	class eventHandlers
 	{
 		init="[(_this select 0),'CfgVehicles','DZ_British_ACU'] execVM '\z\addons\dayz_code\init\object_BackpackAction.sqf';";
-	};
+	};	
 };
 
 class DZ_CivilBackpack_EP1: Bag_Base_EP1    
 {
-	scope = public;
+	scope = 2;
-	displayName = $STR_EPOCH_PACK_CZECH;
+	displayName = $STR_BACKPACK_NAME_CZECH;
+	descriptionShort = $STR_BACKPACK_DESC_CZECH;
 	picture = "\ca\weapons_e\data\icons\backpack_ACR_CA.paa";
 	icon = "\ca\weapons_e\data\icons\mapIcon_backpack_CA.paa";
 	mapsize = 2;
@@ -127,13 +134,14 @@ class DZ_CivilBackpack_EP1: Bag_Base_EP1
 	class eventHandlers
 	{
 		init="[(_this select 0),'CfgVehicles','DZ_CivilBackpack_EP1'] execVM '\z\addons\dayz_code\init\object_BackpackAction.sqf';";
-	};
+	};	
 };
 
 class DZ_Backpack_EP1: Bag_Base_EP1
 {
-	scope = public;
+	scope = 2;
-	displayName = $STR_EPOCH_PACK_COYOTE;
+	displayName = $STR_BACKPACK_NAME_COYOTE;
+	descriptionShort = $STR_BACKPACK_DESC_COYOTE;
 	picture = "\ca\weapons_e\data\icons\backpack_US_CA.paa";
 	icon = "\ca\weapons_e\data\icons\mapIcon_backpack_CA.paa";
 	mapsize = 2;

SQF/dayz_code/Configs/CfgVehicles/Skins.hpp

@@ -1,3 +1,4 @@
+
 class Man;
 class CAManBase: Man
 {

SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp

@@ -1,17 +1,4 @@
-class WeaponHolderBase: ReammoBox {
+class WeaponHolderBase;
-	scope = private;
-	accuracy = 1000;
-	vehicleClass = "Survival";
-	displayName = "Weapon";
-	memoryPointSupply = "collect";
-	supplyRadius = 3;
-	transportMaxWeapons = 0;
-	transportMaxMagazines = 0;
-	transportMaxBackpacks = 0;
-	transportAmmo = 0;
-	transportRepair = 0;
-	transportFuel = 0;
-};
 class WoodenArrowF : WeaponHolderBase {
 	scope = public;
 	displayName = $STR_ITEMWOODENARROW_CODE_NAME;
@@ -24,7 +11,7 @@ class WoodenArrowF : WeaponHolderBase {
 };
 class WeaponHolder_ItemCrowbar: WeaponHolderBase
 {
-	scope = public;
+	scope=2;
 	displayName=$STR_EQUIP_NAME_CROWBAR;
 	model="\dayz_equip\models\crowbar.p3d";
 	class eventHandlers
@@ -35,7 +22,7 @@ class WeaponHolder_ItemCrowbar: WeaponHolderBase
 /*
 class WeaponHolder_MeleeBaseBallBat: WeaponHolderBase
 {
-	scope = public;
+	scope=2;
 	displayName=$STR_EQUIP_NAME_BASEBALLBAT;
 	model="\z\addons\dayz_communityassets\models\baseball_bat.p3d";
 	class eventHandlers
@@ -45,7 +32,7 @@ class WeaponHolder_MeleeBaseBallBat: WeaponHolderBase
 };
 class WeaponHolder_MeleeBatBarbed: WeaponHolderBase
 {
-	scope = public;
+	scope=2;
 	displayName=$STR_CRAFT_NAME_BaseBallBatBarbed;
 	model="\z\addons\dayz_communityassets\models\baseball_bat.p3d";
 	class eventHandlers
@@ -55,7 +42,7 @@ class WeaponHolder_MeleeBatBarbed: WeaponHolderBase
 };
 class WeaponHolder_MeleeBaseBallBatNails: WeaponHolderBase
 {
-	scope = public;
+	scope=2;
 	displayName=$STR_CRAFT_NAME_NailedBaseballBat;
 	model="\z\addons\dayz_communityassets\models\baseball_bat_nails.p3d";
 	class eventHandlers
@@ -66,7 +53,7 @@ class WeaponHolder_MeleeBaseBallBatNails: WeaponHolderBase
 */
 class WeaponHolder_MeleeMachete: WeaponHolderBase
 {
-	scope = public;
+	scope=2;
 	displayName=$STR_EQUIP_NAME_MACHETE;
 	model="\z\addons\dayz_communityassets\models\machete.p3d";
 	class eventHandlers

SQF/dayz_code/Configs/CfgVehicles/antihack_logic.hpp

@@ -1,43 +1,43 @@
-
+	
-//Prevent SVI hack using BattleFieldClearance & al.
+	//Prevent SVI hack using BattleFieldClearance & al.
-class Logic;
+	class Logic;
-class BattleFieldClearance: Logic
+	class BattleFieldClearance: Logic
-{
+	{
-	vehicleClass = "Modules";
+		vehicleClass = "Modules";
-	class Eventhandlers
+		class Eventhandlers
-	{	
+		{	
-		init = "if (isServer) then { diag_log(""WARNING, b4ttlefieldclearance attack from player PID#""+str(owner this)); deleteVehicle this;};";
+			init = "if (isServer) then { diag_log(""WARNING, b4ttlefieldclearance attack from player PID#""+str(owner this)); deleteVehicle this;};";
-	};
+		};
-};
+	};
-class HighCommandSubordinate: Logic
+	class HighCommandSubordinate: Logic
-{
+	{
-	vehicleClass = "Modules";
+		vehicleClass = "Modules";
-	class Eventhandlers
+		class Eventhandlers
-	{
+		{
-		init = "if (isServer) then { diag_log(""WARNING, HighCommand5ubordinate attack from player PID#""+str(owner this)); deleteVehicle this;};";
+			init = "if (isServer) then { diag_log(""WARNING, HighCommand5ubordinate attack from player PID#""+str(owner this)); deleteVehicle this;};";
-	};
+		};
-};
+	};
-class FirstAidSystem: Logic
+	class FirstAidSystem: Logic
-{
+	{
-	vehicleClass = "Modules";
+		vehicleClass = "Modules";
-	class Eventhandlers
+		class Eventhandlers
-	{
+		{
-		init = "if (isServer) then { diag_log(""WARNING, First4idSystem attack from player PID#""+str(owner this)); deleteVehicle this;};";
+			init = "if (isServer) then { diag_log(""WARNING, First4idSystem attack from player PID#""+str(owner this)); deleteVehicle this;};";
-	};
+		};
-};
+	};
-class AlternativeInjurySimulation: Logic
+	class AlternativeInjurySimulation: Logic
-{
+	{
-	vehicleClass = "Modules";
+		vehicleClass = "Modules";
-	class Eventhandlers
+		class Eventhandlers
-	{
+		{
-		init = "if (isServer) then { diag_log(""WARNING, 4lternativeInjurySimulation attack from player PID#""+str(owner this)); deleteVehicle this;};";
+			init = "if (isServer) then { diag_log(""WARNING, 4lternativeInjurySimulation attack from player PID#""+str(owner this)); deleteVehicle this;};";
-	};
+		};
-};	
+	};	
-class FunctionsManager : Logic {
+	class FunctionsManager : Logic {
-	vehicleClass = "Modules";
+		vehicleClass = "Modules";
-	class Eventhandlers
+		class Eventhandlers
-	{
+		{
-		init = "diag_log format ['PRELOAD_ Functions\init %1', [_this, BIS_functions_mainscope]];if (isnil 'BIS_functions_mainscope') then { BIS_functions_mainscope = _this select 0;  if (isServer) then {_this execVM 'ca\modules\functions\main.sqf'};} else {_this spawn { diag_log format ['PRELOAD_ Functions\init  ERROR: deleting redundant FM! %1', [_this, (_this select 0), BIS_functions_mainscope]]; _mygrp = group (_this select 0); deleteVehicle (_this select 0); deleteGroup _mygrp;};};if (isnil 'RE') then {diag_log 'MPframework inited';[] execVM '\ca\Modules\MP\data\scripts\MPframework.sqf'};";
+			init = "diag_log format ['PRELOAD_ Functions\init %1', [_this, BIS_functions_mainscope]];if (isnil 'BIS_functions_mainscope') then { BIS_functions_mainscope = _this select 0;  if (isServer) then {_this execVM 'ca\modules\functions\main.sqf'};} else {_this spawn { diag_log format ['PRELOAD_ Functions\init  ERROR: deleting redundant FM! %1', [_this, (_this select 0), BIS_functions_mainscope]]; _mygrp = group (_this select 0); deleteVehicle (_this select 0); deleteGroup _mygrp;};};if (isnil 'RE') then {diag_log 'MPframework inited';[] execVM '\ca\Modules\MP\data\scripts\MPframework.sqf'};";
-	};
+		};
-};  
+	};  
 

SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp

@@ -252,7 +252,6 @@ class CfgWeapons
 	#include "Tools\Flashlight.hpp"
 	#include "Tools\FlashlightRed.hpp"
 	
-	#include "Item\Flare.hpp"
 	#include "Item\ItemKeyKit.hpp"
 	#include "Item\ItemKeys.hpp"
 	

SQF/dayz_code/Configs/CfgWeapons/Item/Flare.hpp

@@ -1,36 +0,0 @@
-class Flare : GrenadeLauncher {
-		class ThrowMuzzle;
-		class MolotovCocktailMuzzle : ThrowMuzzle {
-			displayName = $STR_ACTION_THROW;
-			magazines[] = {
-				"TrashJackDaniels", 
-				"ItemSodaEmpty", 
-				"TrashTinCan",
-				"FoodCanGriffEmpty",
-				"FoodCanBadguyEmpty",
-				"FoodCanBoneboyEmpty",
-				"FoodCanCornEmpty",
-				"FoodCanCurgonEmpty",
-				"FoodCanDemonEmpty",
-				"FoodCanFraggleosEmpty",
-				"FoodCanHerpyEmpty",
-				"FoodCanOrlokEmpty",
-				"FoodCanPowellEmpty",
-				"FoodCanTylersEmpty",
-				"FoodCanUnlabeledEmpty",
-				"ItemSodaCokeEmpty",
-				"ItemSodaPepsiEmpty",
-				"ItemSodaMdewEmpty",
-				"ItemSodaMtngreenEmpty",
-				"ItemSodaR4z0rEmpty",
-				"ItemSodaClaysEmpty",
-				"ItemSodaSmashtEmpty", 
-				"ItemSodaDrwasteEmpty", 
-				"ItemSodaLemonadeEmpty", 
-				"ItemSodaLvgEmpty", 
-				"ItemSodaMzlyEmpty", 
-				"ItemSodaRabbitEmpty",
-				"ItemTrashToiletpaper"
-			};          
-		};
-	}; 

SQF/dayz_code/Configs/CfgWeapons/Loot.hpp

@@ -1,55 +1,36 @@
-class Loot: Default
+class Loot : Default
 {
 	scope = public;
 	value = 0;
-	type = 0;
+	type = WeaponNoSlot;
 	displayName = "Use";
-	canDrop = 0;
+	canDrop = false;
-	muzzles[] = {"this"};
+	muzzles[] = {this};
-	magazines[] = {
+	modes[] = {this};
-		"ItemSepsisBandage",
+	useAction = false;
-		"FoodBioMeat",
+	useActionTitle = "";
-		"ItemZombieParts",
+	enableAttack = false;
+	showToPlayer = false;
+	
+	//Insert here magazines to show up as "Take x" in action menu
+	magazines[] =
+	{
+		//medical
 		"ItemBandage",
+		"ItemSepsisBandage",
+		"ItemPainkiller",
+		"ItemMorphine",
+		"ItemAntibiotic",
 		"ItemHeatPack",
-		"PartWoodPile",
+		"ItemEpinephrine"
-		"PartFueltank",
+		
+		//vehicle parts
+		/*"PartFueltank",
 		"PartWheel",
 		"PartGeneric",
 		"PartEngine",
 		"PartVRotor",
 		"PartGlass",
-		"ItemWaterbottle",
+		"ItemJerrycan",*/
-		"ItemWaterbottleUnfilled",
-		"ItemEpinephrine",
-		"ItemGoldBar",
-		"ItemSilverBar",
-		"ItemMorphine",
-		"ItemBloodbag",
-		"ItemAntibiotic",
-		"ItemPainkiller",
-		"ItemJerrycan",
-		"ItemOilBarrel",
-		"ItemGenerator",
-		"ItemTent",
-		"ItemSandbag",
-		"ItemTankTrap",
-		"ItemWire",
-		"FoodSteakRaw",
-		"TrashTinCan",
-		"ItemSodaCoke",
-		"ItemSodaPepsi",
-		"ItemSodaMdew",
-		"FoodEdible",
-		"FoodBeefCooked",
-		"FoodCanBakedBeans",
-		"FoodCanSardines",
-		"FoodCanFrankBeans",
-		"FoodCanPasta"
 	};
-	modes[] = {"this"};
+};
-	useAction = 0;
-	useActionTitle = "";
-	enableAttack = 0;
-	showToPlayer = 0;
-};

SQF/dayz_code/Configs/CfgWorlds/intro.Chernarus/initintro.sqs

@@ -1,115 +0,0 @@
-;
-;        Created exclusively for ArmA2:OA - DayZMod.
-;        Please request permission to use/alter/distribute from project leader (R4Z0R49) AND the author (DayZDev@Skaronator.com)
-;
-
-titleCut ["", "BLACK FADED", 0];
-showCinemaBorder false
-
-0 fadeMusic 0;
-playMusic ["dayz_track_death_1",16];
-5 fadeMusic 0.5;
-
-skipTime random 9;
-0 setOvercast random 0.85;
-
-~0.01
-	"colorCorrections" ppEffectAdjust [1, 1, 0, [0.0, 0.0, 0.0, 0.0], [0.81, 0.81, 0.883, 0.6],[0.099, 0.487, 0.014, 0.0]];  "colorCorrections" ppEffectCommit 0;  "colorCorrections" ppEffectEnable true;  
-	"filmGrain" ppEffectEnable true; 
-	"filmGrain" ppEffectAdjust [0.04, 1, 1, 0.1, 1, false];
-	"filmGrain" ppEffectCommit 0; 
-	
-"radialBlur" ppEffectEnable false;
-"wetDistortion" ppEffectEnable false;
-"chromAberration" ppEffectEnable false;
-"dynamicBlur" ppEffectEnable false;
-
-
-
-_camera = "camera" camCreate  [12222.323, 3415.7791, -0.059190542]
-
-;##################1 - 1. Point
-_camera camPrepareTarget [6433.5786, 2648.6802, 37.057621]
-_camera camPrepareFOV 0.700
-_camera camCommand "intertia on"
-_camera cameraEffect ["internal","back"]
-
-_camera camPrepareTarget [6433.5786, 2548.6802, 37.057621]
-_camera camPreparePos [6703.0737, 2325.9983, 0.4]
-_camera camPreload 15
-#loop
-
-camPreloaded _camera
-_camera camCommitPrepared 0
-titleCut ["", "BLACK IN", 5];
-
-
-;##################1 - 2. Point
-_camera camPrepareTarget [6786.1255, 2481.9768, 28.410231]
-_camera camPreparePos [6681.1963, 2348.0803, 7]
-_camera camPrepareFOV 0.700
-_camera camCommitPrepared 30
-
-~15
-
-;##################2 - 1. Point
-_camera camPrepareTarget [5210.0571, 7646.0366, 9.1552734e-005]
-_camera camPreparePos [5219.0688, 7613.1143, 1]
-_camera camPrepareFOV 0.700
-_camera camPreload 15
-~10
-titleCut ["", "BLACK OUT", 5];
-~5
-_camera camCommitPrepared 0
-titleCut ["", "BLACK IN", 5];
-
-
-;##################2 - 2. Point
-_camera camPrepareTarget [5210.0571, 7646.0366, 9.1552734e-005]
-_camera camPreparePos [5236.7905, 7636.2803, 8.8136444]
-_camera camPrepareFOV 0.700
-_camera camCommitPrepared 30
-
-~15
-
-;##################3 - 1. Point
-_camera camPrepareTarget [4653.6475, 9595.6875, 6.1035156e-005]
-_camera camPreparePos [4572.0542, 9593.2588, 4]
-_camera camPrepareFOV 0.700
-_camera camPreload 15
-~10
-titleCut ["", "BLACK OUT", 5];
-~5
-_camera camCommitPrepared 0
-titleCut ["", "BLACK IN", 5];
-
-;##################3 - 2. Point
-_camera camPrepareTarget [4617.71, 9586.6768, 6.1035156e-005]
-_camera camPreparePos [4606.9297, 9621.3691, 9.5633936]
-_camera camPrepareFOV 0.700
-_camera camCommitPrepared 30
-
-~15
-;##################1 - 1. Point
-_camera camPrepareTarget [6433.5786, 2548.6802, 37.057621]
-_camera camPreparePos [6703.0737, 2325.9983, 0.4]
-_camera camPreload 15
-~10
-5 fadeMusic 0
-titleCut ["", "BLACK OUT", 5];
-~5
-
-
-skipTime random -2;
-0 setOvercast random 0.5;
-
-
-titleCut ["", "BLACK FADED", 0];
-goto "loop"
-
-;exit
-player cameraEffect ["terminate","back"]
-_this switchMove ""
-camDestroy _camera
-exit
-

SQF/dayz_code/Configs/RscDisplay/RscLobby.hpp

@@ -1,82 +1,149 @@
 class RscDisplayMultiplayerSetup: RscStandardDisplay
 {
-	idd = 70;
+	onload = "with uiNameSpace do{RscDisplayMultiplayerSetup=_this select 0}; [_this] execVM 'z\addons\dayz_code\init\lobbyAutoJoin.sqf'"; //#70
-	colorNotAssigned[] = {0.4,0.4,0.4,1};
+	onMouseHolding = "with uiNameSpace do { switch (1 == 1) do { case(isNil 'RscDMSLoad'): { RscDMSLoad = diag_tickTime; }; case(RscDMSLoad == -1): {}; case(RscDMSLoad == -2): {}; case(diag_tickTime - RscDMSLoad > 7): { RscDMSLoad = diag_tickTime; }; case(diag_tickTime - RscDMSLoad > 5): { }; }; };";
-	colorAssigned[] = {0.78,0.39,0,1};
+	/*
-	colorConfirmed[] = {0,1,0,1};
+		with uiNameSpace do
-	onLoad = "[_this] execVM 'z\addons\dayz_code\init\lobbyAutoJoin.sqf'";
+		{
-	class controls
+			switch (1 == 1) do
+			{
+				case(isNil 'RscDMSLoad'): { RscDMSLoad = diag_tickTime; };
+				case(RscDMSLoad == -1): {};
+				case(RscDMSLoad == -2): {};
+				case(diag_tickTime - RscDMSLoad > 7): { RscDMSLoad = diag_tickTime; };
+				case(diag_tickTime - RscDMSLoad > 5): { ctrlActivate ((_this select 0) displayCtrl 1); RscDMSLoad = -1; };
+			};
+		};
+	*/
+	onButtonClick = "with uiNameSpace do{RscDMSLoad=-1};false";
+	onButtonDblClick = "with uiNameSpace do{RscDMSLoad=-1};false";
+	onKeyDown = "with uiNameSpace do{RscDMSLoad=-1};false";
+  
+	class controlsbackground
 	{
-		class TextMission: RscText
+		class dayz_black: RscText
 		{
-			idc = 1002;
+			idc=1017;
-			x = "(02/100)	* SafeZoneW + SafeZoneX";
+			colorBackground[] = {0,0,0,1};
-			y = "(9.5/100)	* SafeZoneH + SafeZoneY";
+			x = "SafeZoneX";
-			w = "(18/100)	* SafeZoneW";
+			y = "SafeZoneY";
-			h = "(3/100)	* SafeZoneH";
+			w = "SafeZoneW";
-			SizeEx = 0.03;
+			h = "SafeZoneH";
-			text = "Mission:";
 		};
-		class ValueMission: RscText
+		class MP_roles_TitleBorder: RscText
 		{
-			idc = 101;
+			idc=1008;
-			x = "(20/100)	* SafeZoneW + SafeZoneX";
-			y = "(9.5/100)	* SafeZoneH + SafeZoneY";
-			w = "(40/100)	* SafeZoneW";
-			h = "(3/100)	* SafeZoneH";
-			SizeEx = 0.03;
 		};
+		class TextBack: RscText
+		{
+			idc=1009;
+		};
+		class TextBorder: RscText
+		{
+			idc=1010;
+		};
+		class SidesBack: RscText
+		{
+			idc=1011;
+			y = "(120/100) * SafeZoneH + SafeZoneY";
+		};
+		class SidesBorder: RscText
+		{
+			idc=1012;
+			y = "(120/100) * SafeZoneH + SafeZoneY";
+		};		
+		class ValueRolesBack: RscText
+		{
+			idc=1013;
+			y = "(120/100) * SafeZoneH + SafeZoneY";
+		};
+		class ValueRolesBorder: RscText
+		{
+			idc=1014;
+			y = "(120/100) * SafeZoneH + SafeZoneY";
+		};
+		class ValuePoolBack: RscText
+		{
+			idc=1015;
+			y = "(120/100) * SafeZoneH + SafeZoneY";
+		};
+		class ValuePoolBorder: RscText
+		{
+			idc=1016;
+			y = "(120/100) * SafeZoneH + SafeZoneY";
+		};
+	};
+	class controls
+	{ 
 		class TextIsland: RscText
 		{
 			idc = 1003;
-			x = "(60/100)	* SafeZoneW + SafeZoneX";
+			y = "(109.5/100) * SafeZoneH + SafeZoneY"; //hide
-			y = "(9.5/100)	* SafeZoneH + SafeZoneY";
-			w = "(5/100)	* SafeZoneW";
-			h = "(3/100)	* SafeZoneH";
-			SizeEx = 0.03;
-			text = "Map:";
 		};
 		class ValueIsland: RscText
 		{
 			idc = 102;
-			x = "(65/100)	* SafeZoneW + SafeZoneX";
+			y = "(109.5/100) * SafeZoneH + SafeZoneY"; //hide
-			y = "(9.5/100)	* SafeZoneH + SafeZoneY";
-			w = "(33/100)	* SafeZoneW";
-			h = "(3/100)	* SafeZoneH";
-			SizeEx = 0.03;
 		};
 		class TextSide: RscText
 		{
 			idc = 1005;
-			style = 2;
+			y = "(116.5/100) * SafeZoneH + SafeZoneY"; //hide
-			x = "(02/100)	* SafeZoneW + SafeZoneX";
-			y = "(16.5/100)	* SafeZoneH + SafeZoneY";
-			w = "(16/100)	* SafeZoneW";
-			h = "(3/100)	* SafeZoneH";
-			SizeEx = 0.03921;
-			text = "Side:";
 		};
 		class TextRoles: RscText
 		{
-			idc = 108;
+			idc = 1007; // new, idc was missed by BI
-			style = 2;
+			y = "(116.5/100) * SafeZoneH + SafeZoneY"; // hide
-			x = "(20/100)	* SafeZoneW + SafeZoneX";
+		};
-			y = "(16.5/100)	* SafeZoneH + SafeZoneY";
+		class CA_B_West: RscActiveText
-			w = "(38/100)	* SafeZoneW";
+		{
-			h = "(3/100)	* SafeZoneH";
+			idc = 104;
-			SizeEx = 0.03921;
+			y = "(121/100) * SafeZoneH + SafeZoneY"; //hide
-			text = "Side:";
+		};
+		class CA_B_East: CA_B_West
+		{
+			idc = 105;
+			y = "(131/100) * SafeZoneH + SafeZoneY"; //hide
+		};
+		class CA_B_Guerrila: CA_B_West
+		{
+			idc = 106;
+			y = "(141/100) * SafeZoneH + SafeZoneY"; //hide
+		};
+		class CA_B_Civilian: CA_B_West
+		{
+			idc = 107;
+			y = "(151/100) * SafeZoneH + SafeZoneY"; //hide
+		};
+		class CA_ValueRoles: RscIGUIListBox
+		{
+			idc = 109;
+			style = 16;
+			y = "(120.5/100) * SafeZoneH + SafeZoneY"; //hide
 		};
 		class TextPool: RscText
 		{
 			idc = 1006;
-			style = 2;
+			x = "(2/100) * SafeZoneW + SafeZoneX"; // to left
-			x = "(60/100)	* SafeZoneW + SafeZoneX";
+			w = "(96/100) * SafeZoneW"; //wide (was: 38/100)
-			y = "(16.5/100)	* SafeZoneH + SafeZoneY";
+		};
-			w = "(38/100)	* SafeZoneW";
+		class CA_ValuePool: RscIGUIListBox
-			h = "(3/100)	* SafeZoneH";
+		{
-			SizeEx = 0.03921;
+			idc = 114;
-			text = "Pool:";
+			text = "Players";
+			x = "(2/100) * SafeZoneW + SafeZoneX"; // to left
+			w = "(96/100) * SafeZoneW"; // wide
+		};
+		class CA_ButtonCancel: RscShortcutButton
+		{
+			idc = 2;
+			default = 0;
+			shortcuts[] = {"0x00050000 + 1"};
+			x = "(68/100)	* SafeZoneW + SafeZoneX";
+			y = "(93/100)	* SafeZoneH + SafeZoneY";
+			w = 0.203825;
+			text = "$STR_DISP_BACK";
+			onButtonClick = "with uiNameSpace do {RscDMSLoad=nil;};"; // autologon at logon on next server
 		};
 		class Y_GamerCard: RscActiveText
 		{
@@ -102,173 +169,6 @@ class RscDisplayMultiplayerSetup: RscStandardDisplay
 			y = 0.9;
 			w = 0.15;
 		};
-		class CA_MP_roles_Title: CA_Title
-		{
-			idc = 1001;
-			style = 2;
-			x = "(02/100)	* SafeZoneW + SafeZoneX";
-			y = "(02/100)	* SafeZoneH + SafeZoneY";
-			w = "(96/100)	* SafeZoneW";
-			h = "(06/100)	* SafeZoneH";
-			colorBackground[] = {"49/255","36/255","25/255","173/255"};
-			text = "Multiplayer Setup";
-		};
-		class CA_TextVotingTimeLeft: CA_MP_roles_Title
-		{
-			idc = 121;
-			style = 1;
-			x = "(50/100)	* SafeZoneW + SafeZoneX";
-			y = "(02/100)	* SafeZoneH + SafeZoneY";
-			w = "(45/100)	* SafeZoneW";
-			colorBackground[] = {0,0,0,0};
-		};
-		class CA_TextDescription: RscText
-		{
-			idc = 1004;
-			x = "(02/100)	* SafeZoneW + SafeZoneX";
-			y = "(12.5/100)	* SafeZoneH + SafeZoneY";
-			w = "(18/100)	* SafeZoneW";
-			h = "(3/100)	* SafeZoneH";
-			SizeEx = 0.03;
-			text = "Description:";
-		};
-		class CA_ValueDescription: RscText
-		{
-			idc = 103;
-			x = "(20/100)	* SafeZoneW + SafeZoneX";
-			y = "(12.5/100)	* SafeZoneH + SafeZoneY";
-			w = "(78/100)	* SafeZoneW";
-			h = "(3/100)	* SafeZoneH";
-			SizeEx = 0.03;
-		};
-		class CA_B_West: RscActiveText
-		{
-			x = "(4.15/100)	* SafeZoneW + SafeZoneX";
-			y = "(21/100)	* SafeZoneH + SafeZoneY";
-			w = "(11.7/100)	* SafeZoneW";
-			h = "(7/100)	* SafeZoneH";
-			style = "0x02 + 0x100 + 0x40";
-			type = 11;
-			colorActive[] = {1,1,1,1};
-			colorDisabled[] = {1,1,1,0.15};
-			colorShade[] = {1,1,1,1};
-			colorText[] = {1,1,1,1};
-			pictureWidth = 1;
-			pictureHeight = 1;
-			textHeight = 0.38;
-			sideDisabled = "ca\ui\data\flag_none_ca.paa";
-			sideToggle = "ca\ui\data\flag_side_toggle_ca.paa";
-			idc = 104;
-			color[] = {1,1,1,0.55};
-			text = "BLUFOR";
-			picture = "\ca\ui\data\flag_bluefor_ca.paa";
-		};
-		class CA_B_East: CA_B_West
-		{
-			idc = 105;
-			y = "(31/100)	* SafeZoneH + SafeZoneY";
-			text = "OPFOR";
-			picture = "\ca\ui\data\flag_opfor_ca.paa";
-		};
-		class CA_B_Guerrila: CA_B_West
-		{
-			idc = 106;
-			y = "(41/100)	* SafeZoneH + SafeZoneY";
-			text = "Independent";
-			picture = "\ca\ui\data\flag_indep_ca.paa";
-		};
-		class CA_B_Civilian: CA_B_West
-		{
-			idc = 107;
-			y = "(51/100)	* SafeZoneH + SafeZoneY";
-			text = "Civilian";
-			picture = "\ca\ui\data\flag_civil_ca.paa";
-		};
-		class CA_ValueRoles: RscIGUIListBox
-		{
-			idc = 109;
-			style = 16;
-			x = "(20/100)	* SafeZoneW + SafeZoneX";
-			y = "(20.5/100)	* SafeZoneH + SafeZoneY";
-			w = "(38/100)	* SafeZoneW";
-			h = "(72/100)	* SafeZoneH";
-			color[] = {1,1,1,1};
-			colorSelect[] = {1,1,0,1};
-			colorSelectBackground[] = {0.2,0.2,0.2,1};
-			colorSelectBackground2[] = {0.1,0.1,0.1,1};
-			rowHeight = 0.05;
-			colorText[] = {0.95,0.95,0.95,1};
-			colorPlayer[] = {1,1,0,1};
-			colorAI[] = {1,0,0,1};
-			colorNobody[] = {0.4,0.4,0.4,1};
-			enabledAI = "ca\ui\textures\ai2_on.paa";
-			disabledAI = "ca\ui\textures\ai2_off.paa";
-		};
-		class CA_ValuePool: RscIGUIListBox
-		{
-			idc = 114;
-			style = 16;
-			x = "(60/100)	* SafeZoneW + SafeZoneX";
-			y = "(20/100)	* SafeZoneH + SafeZoneY";
-			w = "(38/100)	* SafeZoneW";
-			h = "(72/100)	* SafeZoneH";
-			color[] = {1,1,1,1};
-			colorSelect[] = {1,1,0,1};
-			colorSelectBackground[] = {0.2,0.2,0.2,1};
-			colorSelectBackground2[] = {0.1,0.1,0.1,1};
-			rows = 25;
-			canDrag = 1;
-		};
-		class CA_B_EnableAll: RscShortcutButton
-		{
-			idc = 117;
-			x = "(22/100)	* SafeZoneW + SafeZoneX";
-			y = "(93/100)	* SafeZoneH + SafeZoneY";
-			w = 0.223825;
-			class TextPos
-			{
-				left = 0.035;
-				top = 0.034;
-				right = 0.005;
-				bottom = 0.005;
-			};
-			default = 0;
-		};
-		class CA_B_Lock: RscShortcutButton
-		{
-			idc = 118;
-			x = "(39/100)	* SafeZoneW + SafeZoneX";
-			y = "(93/100)	* SafeZoneH + SafeZoneY";
-			w = 0.183825;
-		};
-		class CA_B_Params: RscShortcutButton
-		{
-			idc = 128;
-			x = "(53/100)	* SafeZoneW + SafeZoneX";
-			y = "(93/100)	* SafeZoneH + SafeZoneY";
-			w = 0.203825;
-			text = "Parameters";
-		};
-		class CA_B_DSinterface: RscShortcutButton
-		{
-			idc = 1012;
-			default = 0;
-			onButtonClick = "openDSInterface;";
-			shortcuts[] = {};
-			x = "(2.75/100)	* SafeZoneW + SafeZoneX";
-			y = "(93/100)	* SafeZoneH + SafeZoneY";
-			w = 0.26;
-			text = "Server Control";
-		};
-		class CA_B_Kick: RscShortcutButton
-		{
-			idc = 116;
-			default = 0;
-			shortcuts[] = {"0x00050000 + 2"};
-			x = "(83/100)	* SafeZoneW + SafeZoneX";
-			y = "(14/100)	* SafeZoneH + SafeZoneY";
-			text = "Kick Off";
-		};
 		class CA_ButtonContinue: RscShortcutButton
 		{
 			idc = 1;
@@ -279,16 +179,6 @@ class RscDisplayMultiplayerSetup: RscStandardDisplay
 			text = "OK";
 			onButtonClick = "((findDisplay 70) displayCtrl 300) ctrlShow false;";
 		};
-		class CA_ButtonCancel: RscShortcutButton
-		{
-			idc = 2;
-			default = 0;
-			shortcuts[] = {"0x00050000 + 1"};
-			x = "(68/100)	* SafeZoneW + SafeZoneX";
-			y = "(93/100)	* SafeZoneH + SafeZoneY";
-			w = 0.203825;
-			text = "Back";
-		};
 		class infoText: RscText
 		{
 			idc = 300;
@@ -301,101 +191,4 @@ class RscDisplayMultiplayerSetup: RscStandardDisplay
 			colorBackground[] = {0,0,0,0};
 		};
 	};
-	west = "ca\ui\data\flag_bluefor_ca.paa";
-	east = "ca\ui\data\flag_opfor_ca.paa";
-	guer = "ca\ui\data\flag_indep_ca.paa";
-	civl = "ca\ui\data\flag_civil_ca.paa";
-	none = "ca\ui\data\flag_civil_ca.paa";
-	westUnlocked = "ca\ui\data\flag_bluefor_ca.paa";
-	westLocked = "ca\ui\data\flag_bluefor_ca.paa";
-	eastUnlocked = "ca\ui\data\flag_opfor_ca.paa";
-	eastLocked = "ca\ui\data\flag_opfor_ca.paa";
-	guerUnlocked = "ca\ui\data\flag_indep_ca.paa";
-	guerLocked = "ca\ui\data\flag_indep_ca.paa";
-	civlUnlocked = "ca\ui\data\flag_civil_ca.paa";
-	civlLocked = "ca\ui\data\flag_civil_ca.paa";
-	disabledAllAI = "Enable AI";
-	enabledAllAI = "Disable AI";
-	hostLocked = "Unlock";
-	hostUnlocked = "Lock";
-	class controlsbackground
-	{
-		class MP_roles_TitleBorder: RscText
-		{
-			style = 64;
-			colorText[] = {0,0,0,1};
-			x = "(02/100)	* SafeZoneW + SafeZoneX";
-			y = "(02/100)	* SafeZoneH + SafeZoneY";
-			w = "(96/100)	* SafeZoneW";
-			h = "(06/100)	* SafeZoneH";
-		};
-		class TextBack: RscText
-		{
-			x = "(02/100)	* SafeZoneW + SafeZoneX";
-			y = "(9.5/100)	* SafeZoneH + SafeZoneY";
-			w = "(96/100)	* SafeZoneW";
-			h = "(6/100)	* SafeZoneH";
-			colorBackground[] = {0.1961,0.1451,0.0941,0.42};
-		};
-		class TextBorder: RscText
-		{
-			style = 64;
-			colorText[] = {0,0,0,1};
-			x = "(02/100)	* SafeZoneW + SafeZoneX";
-			y = "(9.5/100)	* SafeZoneH + SafeZoneY";
-			w = "(96/100)	* SafeZoneW";
-			h = "(6/100)	* SafeZoneH";
-		};
-		class SidesBack: RscText
-		{
-			x = "(2/100)	* SafeZoneW + SafeZoneX";
-			y = "(20/100)	* SafeZoneH + SafeZoneY";
-			w = "(16/100)	* SafeZoneW";
-			h = "(73/100)	* SafeZoneH";
-			colorBackground[] = {0.1961,0.1451,0.0941,0.42};
-		};
-		class SidesBorder: RscText
-		{
-			style = 64;
-			colorText[] = {0,0,0,1};
-			x = "(2/100)	* SafeZoneW + SafeZoneX";
-			y = "(20/100)	* SafeZoneH + SafeZoneY";
-			w = "(16/100)	* SafeZoneW";
-			h = "(73/100)	* SafeZoneH";
-		};
-		class ValueRolesBack: RscText
-		{
-			x = "(20/100)	* SafeZoneW + SafeZoneX";
-			y = "(20/100)	* SafeZoneH + SafeZoneY";
-			w = "(38/100)	* SafeZoneW";
-			h = "(73/100)	* SafeZoneH";
-			colorBackground[] = {0.1961,0.1451,0.0941,0.42};
-		};
-		class ValueRolesBorder: RscText
-		{
-			style = 64;
-			colorText[] = {0,0,0,1};
-			x = "(20/100)	* SafeZoneW + SafeZoneX";
-			y = "(20/100)	* SafeZoneH + SafeZoneY";
-			w = "(38/100)	* SafeZoneW";
-			h = "(73/100)	* SafeZoneH";
-		};
-		class ValuePoolBack: RscText
-		{
-			x = "(60/100)	* SafeZoneW + SafeZoneX";
-			y = "(20/100)	* SafeZoneH + SafeZoneY";
-			w = "(38/100)	* SafeZoneW";
-			h = "(73/100)	* SafeZoneH";
-			colorBackground[] = {0.1961,0.1451,0.0941,0.42};
-		};
-		class ValuePoolBorder: RscText
-		{
-			style = 64;
-			colorText[] = {0,0,0,1};
-			x = "(60/100)	* SafeZoneW + SafeZoneX";
-			y = "(20/100)	* SafeZoneH + SafeZoneY";
-			w = "(38/100)	* SafeZoneW";
-			h = "(73/100)	* SafeZoneH";
-		};
-	};
 };

SQF/dayz_code/Configs/RscDisplay/includes.hpp

@@ -1,7 +1,7 @@
-#include "RscLobby.hpp"
 #include "RscDisplayCraftingMenu.hpp"
 #include "RscDisplayGear.hpp"
 #include "RscDisplayGenderSelect.hpp"
 #include "RscDisplaySpawnSelecter.hpp"
 #include "RscPlayerUI.hpp"
 #include "RscMap.hpp"
+//#include "RscDisplayConstructionMenu.hpp"

SQF/dayz_code/Configs/cfgFaces.hpp

@@ -1,6 +1,6 @@
 class Man;	// External class reference
 class Custom;	// External class reference
-//class Default;
+class Default;	// External class reference
 class CfgFaces {
 	class Default;	// External class reference
 	

SQF/dayz_code/Configs/rscTitles.hpp

@@ -31,7 +31,8 @@ class RscHTML;
 #include "CfgPlayerStats\p_murders.hpp"
 #include "CfgPlayerStats\sound.hpp"
 
-class RscPictureGUI {
+class RscPictureGUI
+{
 	access = 0;
 	type = 0;
 	idc = -1;
@@ -48,23 +49,31 @@ class RscPictureGUI {
 	h = 0.15;
 };
 
+
 class RscStructuredText {
 	class Attributes;
 };
-class RscStructuredTextGUI: RscStructuredText {
+class RscStructuredTextGUI: RscStructuredText
+{
 	colorBackground[] = {0,0,0,0};
 	colorText[] = {1,1,1,1};
-	class Attributes: Attributes {
+	class Attributes: Attributes
+	{
 		align = "center";
 		valign = "middle";
 	};
 };
 
-class RscDisplayLoading {
+class RscDisplayLoading
-	class Variants {
+{
-		class LoadingOne {
+	class Variants
-			class controls {
+	{
-				class LoadingPic : RscPictureKeepAspect {
+		class LoadingOne
+		{
+			class controls
+			{
+				class LoadingPic : RscPictureKeepAspect
+				{
 					text = "z\addons\dayz_code\gui\loadingscreen.paa";
 				};
 			};
@@ -76,21 +85,28 @@ class RscCompass : RscObject {
 	scale = 0.64;
 };
 
-class RscDisplayStart {
+class RscDisplayStart
-	class controls {
+{
-		class LoadingPic: RscPictureKeepAspect {
+	class controls
+	{
+		class LoadingPic: RscPictureKeepAspect
+		{
 			text = "z\addons\dayz_code\gui\loadingscreen.paa";
 		};
 	};
 };
 class RscDisplayGetReady;
-class RscDisplayClientGetReady: RscDisplayGetReady {
+class RscDisplayClientGetReady : RscDisplayGetReady
+{
 	// could probably add a check in the spawn but couldn't test with multiple players
-	onload = "private ['_dummy']; _dummy = [_this,'onload'] call compile preprocessfile '\ca\ui\scripts\server_interface.sqf'; _this spawn { while { !isNull (findDisplay 53) } do { ctrlActivate ((_this select 0) displayCtrl 1); uiSleep 0.1; }; };";
+	onload = "[_this,'onload'] call compile preprocessfile '\ca\ui\scripts\server_interface.sqf'; _this spawn { while { !isNull (findDisplay 53) } do { ctrlActivate ((_this select 0) displayCtrl 1); uiSleep 0.1; }; };"; /*diag_log[diag_tickTime,'RscDisplayClientGetReady'];*/
 };
-class RscDisplayDebriefing: RscStandardDisplay {
+
+class RscDisplayDebriefing: RscStandardDisplay
+{
 	onLoad = "ctrlActivate ((_this select 0) displayCtrl 2);";
-	class controls {
+	class controls
+	{
 		delete Debriefing_MissionTitle;
 		delete CA_MissionTitle;
 		delete CA_TextVotingTimeLeft;
@@ -101,7 +117,8 @@ class RscDisplayDebriefing: RscStandardDisplay {
 		delete CA_DebriefingStatsGroup;
 		delete ButtonStatistics;
 		delete ButtonRetry;
-		class ButtonContinue: RscIGUIShortcutButton {
+		class ButtonContinue: RscIGUIShortcutButton
+		{
 			idc = 2;
 			shortcuts[] = {"0x00050000 + 0",28,57,156};
 			x = 0.4080875;
@@ -109,13 +126,34 @@ class RscDisplayDebriefing: RscStandardDisplay {
 			text = $STR_UI_CONTINUE;
 		};
 	};
-	class ControlsBackground {
+	class ControlsBackground
+	{
 		delete Mainback;
 	};
 };
-class RscDisplayMissionFail: RscStandardDisplay {
+class RscShortcutButton;
-	onLoad = "ctrlActivate ((_this select 0) displayCtrl 2);";
+class RscShortcutButtonMain;
-	class controls {
+
+// RscDisplayMultiplayerSetup moved here:
+#include "RscDisplay\RscLobby.hpp"
+
+class RscPendingInvitation
+{
+	x = 0.955313 * safezoneW + safezoneX;
+	y = 0.45 * safezoneH + safezoneY;
+};
+
+class RscPendingInvitationInGame
+{
+	x = 0.955313 * safezoneW + safezoneX;
+	y = 0.46 * safezoneH + safezoneY;
+};
+
+class RscDisplayMissionFail: RscStandardDisplay
+{
+	onLoad = "ctrlActivate ((_this select 0) displayCtrl 2);"; /*diag_log[diag_tickTime,'RscDisplayMissionFail'];*/
+	class controls
+	{
 		delete Debriefing_MissionTitle;
 		delete CA_MissionTitle;
 		delete CA_TextVotingTimeLeft;
@@ -125,7 +163,8 @@ class RscDisplayMissionFail: RscStandardDisplay {
 		delete CA_DebriefingObjectivesGroup;
 		delete CA_DebriefingStatsGroup;
 		delete BRetry;
-		class BAbort: RscIGUIShortcutButton {
+		class BAbort: RscIGUIShortcutButton
+		{
 			idc = 2;
 			shortcuts[] = {"0x00050000 + 0",28,57,156};
 			x = 0.4080875;
@@ -133,37 +172,43 @@ class RscDisplayMissionFail: RscStandardDisplay {
 			text = $STR_UI_END;
 		};
 	};
-	class ControlsBackground {
+	class ControlsBackground
+	{
 		delete Mainback;
 	};
 };
 
+
 class CA_TextLanguage;
 class RscXListBox;
 
-class RscDisplayGameOptions {
+class RscDisplayGameOptions
+{
 	//onLoad = "((_this select 0) displayCtrl 140) lbAdd 'Default';((_this select 0) displayCtrl 140) lbAdd 'Debug';((_this select 0) displayCtrl 140) lbAdd 'None';((_this select 0) displayCtrl 140) lbSetCurSel (uiNamespace getVariable ['DZ_displayUI', 0]);";
-	onUnload = "call ui_changeDisplay;";
+	onUnload = "call ui_changeDisplay;"; /*diag_log[diag_tickTime,'RscDisplayGameOptions'];*/
-	class controls {
+	/*class controls
-		class CA_TextUIDisplay: CA_TextLanguage {
+	{
+		class CA_TextUIDisplay: CA_TextLanguage
+		{
 			x = 0.159803;
 			y = "(0.420549 + 4*0.069854)";
 			text = "DayZ UI:";
 		};
-		class CA_ValueUIDisplay: RscXListBox {
+		class CA_ValueUIDisplay: RscXListBox
+		{
 			idc = 140;
 			x = 0.400534;
 			y = "(0.420549 + 4*0.069854)";
 			w = 0.3;
 			onLBSelChanged = "(uiNamespace setVariable ['DZ_displayUI', (_this select 1)]);";
 		};
-	};
+	};*/
 };
-class RscShortcutButton;
-class RscShortcutButtonMain;
 
-class RscDisplayMain : RscStandardDisplay {
+class RscDisplayMain : RscStandardDisplay
-	class controlsBackground {
+{
+	class controlsBackground
+	{
 		class Mainback : RscPicture {
 			idc = 1104;
 			x = "SafeZoneX + 0.04";
@@ -172,16 +217,19 @@ class RscDisplayMain : RscStandardDisplay {
 			h = 1.000000;
 			text = "\ca\ui\data\ui_mainmenu_background_ca.paa";
 		};
-		class CA_ARMA2 : RscPicture {
+		class CA_ARMA2 : RscPicture
+		{
 			text = "z\addons\dayz_code\gui\loadingscreen.paa";
 		};
 	};
 
-	class controls {
+	class controls
+	{
 		class CA_Version;
-		class DAYZ_Version : CA_Version {
+		class DAYZ_Version : CA_Version
+		{
 			idc = -1;
-			text = "1.0.6";
+			text = "DayZ Epoch 1.0.6";
 			y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)";
 		};
 		delete CA_TitleMainMenu;
@@ -244,7 +292,8 @@ class RscDisplayDiary {
 	};
 };
 
-class RscButtonActionMenu: RscButton {
+class RscButtonActionMenu: RscButton
+{
 	SizeEx = 0.02674;
 	colorText[] = {1,1,1,1};
 	colorBackground[] = {0,0,0,0.8};
@@ -261,8 +310,8 @@ class RscDisplayMPInterrupt : RscStandardDisplay {
 	movingEnable = 0;
 	enableSimulation = 1;
 	//onLoad = "_dummy = ['Init', _this] execVM '\ca\ui\scripts\pauseLoadinit.sqf'; [(_this select 0)] execVM '\z\addons\dayz_code\compile\player_onPause.sqf';"; _respawn = (_this select 0) displayCtrl 1010); _respawn ctrlEnable false; _abort = (_this select 0) displayCtrl 104); _abort ctrlEnable false;
-	onLoad = "[] execVM '\z\addons\dayz_code\compile\player_onPause.sqf'; _dummy = ['Init', _this] execVM '\ca\ui\scripts\pauseLoadinit.sqf';";
+	onLoad = "uiNamespace setVariable ['RscDisplayMPInterrupt', _this select 0];[] execVM '\z\addons\dayz_code\compile\player_onPause.sqf'; _dummy = ['Init', _this] execVM '\ca\ui\scripts\pauseLoadinit.sqf';"; /*diag_log[diag_tickTime,'RscDisplayMPInterrupt'];*/
-	onUnload = "private ['_dummy']; _dummy = ['Unload', _this] execVM '\ca\ui\scripts\pauseOnUnload.sqf';";
+	onUnload = "uiNamespace setVariable ['RscDisplayMPInterrupt', nil];['Unload', _this] execVM '\ca\ui\scripts\pauseOnUnload.sqf';";
 
 	class controlsBackground {
 		class Mainback : RscPicture {
@@ -348,7 +397,7 @@ class RscDisplayMPInterrupt : RscStandardDisplay {
 		class CA_B_Abort : CA_B_SAVE {
 			idc = 104;
 			y = 0.2537 + 0.101903 * 4;
-			onButtonClick = "[] execVM '\z\addons\dayz_code\compile\player_onPause.sqf'; call player_forceSave;";
+			onButtonClick = "[] execVM '\z\addons\dayz_code\compile\player_onPause.sqf'; call player_forceSave; with uiNameSpace do {RscDMSLoad=-2;};"; // request disconnection from server
 			text = $STR_DISP_INT_ABORT;
 			default = 0;
 		};
@@ -364,6 +413,8 @@ class RscDisplayMPInterrupt : RscStandardDisplay {
 	};
 };
 
+
+
 /*
 class DZ_ItemInteraction {
 	idd = 6999;

SQF/dayz_code/config.cpp

@@ -108,7 +108,7 @@ class CfgAddons
 
 //Epoch Additions
 #include "Configs\RscDisplay\safegui.hpp"
-#include "Configs\RscDisplay\dialog.hpp"
+#include "Configs\RscDisplay\tradermenu.hpp"
 #include "Configs\RscDisplay\deathboards.hpp"
 #include "Configs\CfgExtra\snappoints.hpp"
 #include "external\R3F_Realism\R3F_Weight\R3F_CfgWeight.h"

SQF/dayz_code/stringtable.xml

@@ -6357,6 +6357,7 @@
 			<Spanish>Mochila de Patrullaje (Coyote)</Spanish>
 			<Czech>Batůžek (coyote)</Czech>
 			<German>Trekkingrucksack (Coyote)</German>
+			<Dutch>Patrouillerugzak (coyote)</Dutch>
 		</Key>
 		<Key ID="STR_BACKPACK_DESC_PATROL">
 			<English>Patrol Pack (coyote)</English>
@@ -6373,6 +6374,7 @@
 			<Spanish>Mochila de Asalto (ACU)</Spanish>
 			<Czech>Batoh Assault Pack (ACU)</Czech>
 			<German>Kampfrucksack (ACU)</German>
+			<Dutch>Aanvalsrugzak (ACU)</Dutch>
 		</Key>
 		<Key ID="STR_BACKPACK_DESC_ACU">
 			<English>Assault Pack (ACU)</English>
@@ -6389,6 +6391,7 @@
 			<Spanish>Bolsa Chaleco</Spanish>
 			<Czech>Česká vesta</Czech>
 			<German>Tschechischer Westenrucksack</German>
+			<Dutch>Tsjechische Borstzak</Dutch>
 		</Key>
 		<Key ID="STR_BACKPACK_DESC_VEST">
 			<English>Czech Vest Pouch</English>
@@ -6405,6 +6408,7 @@
 			<Spanish>Mochila Alice</Spanish>
 			<Czech>Batoh Alice</Czech>
 			<German>Alice Pack</German>
+			<Dutch>ALICE Rugzak</Dutch>
 		</Key>
 		<Key ID="STR_BACKPACK_DESC_ALICE">
 			<English>Alice pack</English>
@@ -6421,6 +6425,7 @@
 			<Spanish>Mochila de Supervivencia ACU</Spanish>
 			<Czech>Batoh Survival ACU</Czech>
 			<German>Kampfrucksack (Woodland)</German>
+			<Dutch>Overlevings ACU</Dutch>
 		</Key>
 		<Key ID="STR_BACKPACK_DESC_SURVACU">
 			<English>Survival ACU</English>
@@ -6437,6 +6442,7 @@
 			<Spanish>Mochila de Asalto Británica</Spanish>
 			<Czech>Britský batoh</Czech>
 			<German>Britischer Kampfrucksack</German>
+			<Dutch>Britse Aanvalsrugzak</Dutch>
 		</Key>
 		<Key ID="STR_BACKPACK_DESC_BRITISH">
 			<English>British Assault Pack</English>
@@ -6453,6 +6459,7 @@
 			<Spanish>Mochila Checa</Spanish>
 			<Czech>Český batoh</Czech>
 			<German>Tschechischer Rucksack</German>
+			<Dutch>Tsjechische Rugzak</Dutch>
 		</Key>
 		<Key ID="STR_BACKPACK_DESC_CZECH">
 			<English>Czech Backpack</English>
@@ -6469,6 +6476,7 @@
 			<Spanish>Mochila (Coyote)</Spanish>
 			<Czech>Batoh (coyote)</Czech>
 			<German>Kampfrucksack (Coyote)</German>
+			<Dutch>Rugzak (Coyote)</Dutch>
 		</Key>
 		<Key ID="STR_BACKPACK_DESC_COYOTE">
 			<English>Backpack (coyote)</English>

SQF/dayz_epoch_b/stringtable.xml

@@ -2885,78 +2885,6 @@
 			<French></French>
 			<Czech>Upgrade vozidla byl úspěšný.</Czech>
 		</Key>
-		<Key ID="STR_EPOCH_PACK_PATROL">
-			<English>Patrol Pack (coyote)</English>
-			<German>Patrouille Rucksack (coyote)</German>
-			<Russian>Патрульный рюкзак (Койот)</Russian>
-			<!-- <Spanish></Spanish> -->
-			<Dutch>Patrouillerugzak (coyote)</Dutch>
-			<French>Sac de Patrouille (coyote)</French>
-			<Czech>Baťůžek (coyote)</Czech>
-		</Key>
-		<Key ID="STR_EPOCH_PACK_ASSAULT">
-			<English>Assault Pack (ACU)</English>
-			<German>Sturmtrupp Rucksack (ACU)</German>
-			<Russian>Рюкзак штурмовика (ACU)</Russian>
-			<!-- <Spanish></Spanish> -->
-			<Dutch>Aanvalsrugzak (ACU)</Dutch>
-			<French>Sac d'assaut (ACU)</French>
-			<!-- <Czech></Czech> -->
-		</Key>
-		<Key ID="STR_EPOCH_PACK_POUCH">
-			<English>Czech Vest Pouch</English>
-			<German>Tschechischer Beutel</German>
-			<Russian>Чешский жилет-мешок</Russian>
-			<!-- <Spanish></Spanish> -->
-			<Dutch>Tsjechische Borstzak</Dutch>
-			<French>Veste à poches tchèque</French>
-			<!-- <Czech></Czech> -->
-		</Key>
-		<Key ID="STR_EPOCH_PACK_ALICE">
-			<English>ALICE Pack</English>
-			<German>ALICE Rucksack</German>
-			<!-- <Russian></Russian> -->
-			<!-- <Spanish></Spanish> -->
-			<Dutch>ALICE Rugzak</Dutch>
-			<French>Sac Polyvalent (ALICE)</French>
-			<!-- <Czech></Czech> -->
-		</Key>
-		<Key ID="STR_EPOCH_PACK_ACU">
-			<English>Survival ACU</English>
-			<German>Survival Rucksack (ACU)</German>
-			<Russian>Рюкзак выжившего (ACU)</Russian>
-			<!-- <Spanish></Spanish> -->
-			<Dutch>Overlevings ACU</Dutch>
-			<French>Sac de Survivant (ACU)</French>
-			<!-- <Czech></Czech> -->
-		</Key>
-		<Key ID="STR_EPOCH_PACK_BAP">
-			<English>British Assault Pack</English>
-			<German>Britischer Sturmtrupp Rucksack</German>
-			<Russian>Рюкзак британского штурмовика</Russian>
-			<!-- <Spanish></Spanish> -->
-			<Dutch>Britse Aanvalsrugzak</Dutch>
-			<French>Sac d’assaut Britannique</French>
-			<Czech>Britský Batoh</Czech>
-		</Key>
-		<Key ID="STR_EPOCH_PACK_CZECH">
-			<English>Czech Backpack</English>
-			<German>Tschechische Rucksack</German>
-			<Russian>Чешский рюкзак</Russian>
-			<!-- <Spanish></Spanish> -->
-			<Dutch>Tsjechische Rugzak</Dutch>
-			<French>Sac à dos tchèque</French>
-			<Czech>Český Batoh</Czech>
-		</Key>
-		<Key ID="STR_EPOCH_PACK_COYOTE">
-			<English>Backpack (Coyote)</English>
-			<German>Rucksack (Coyote)</German>
-			<Russian>Рюкзак (Койот)</Russian>
-			<!-- <Spanish></Spanish> -->
-			<Dutch>Rugzak (Coyote)</Dutch>
-			<French>Sac à Dos (coyote)</French>
-			<Czech>Batoh (Coyote)</Czech>
-		</Key>
 		<Key ID="STR_EPOCH_PACK_LGB">
 			<English>Large Gunbag</English>
 			<German>Große Waffentasche</German>