Merge pull request #119 from Arkensor/development

Author: Arkensor

JM/CF/Scripts/3_Game/CommunityFramework/Utils/CF_Date.c

@@ -393,6 +393,18 @@ class CF_Date : Managed
 		return "undefined";
 	}
 
+	//! @note 0 = sunday
+	int GetDayOfWeek()
+	{
+		int y = m_Year;
+		int d = m_Day;
+		if (m_Month < 3)
+			d += y--;
+		else
+			d += y - 2;
+		return (23 * m_Month / 9 + d + 4 + y / 4 - y / 100 + y / 400) % 7;
+	}
+
 	int GetDay()
 	{
 		return m_Day;

JM/CF/Scripts/5_Mission/CommunityFramework/GUI/InventoryNew/Inherited/AttachmentCategoriesContainer.c

@@ -121,7 +121,9 @@ modded class MissionServer
 
 		auto args = new CF_EventNewPlayerArgs(player, identity, pos, ctx);
 		CF_ModuleWorldManager.OnClientNew(this, args);
-		player = args.Player;
+
+		//TODO: allow the args to override these 'out' variables again, 'CF_ModuleWorldManager.OnClientNew' deletes 'args' before this can be used
+		//player = args.Player;
 
 		return player;
 	} 
@@ -137,13 +139,13 @@ modded class MissionServer
 
 		CF_ModuleWorldManager.OnClientPrepare(this, args);
 
-		//identity = args.Identity;
-		useDB = args.UseDatabase;
-		pos = args.Position;
-		yaw = args.Yaw;
-		preloadTimeout = args.PreloadTimeout;
+		//TODO: allow the args to override these 'out' variables again, 'CF_ModuleWorldManager.OnClientPrepare' deletes 'args' before this can be used
+		//useDB = args.UseDatabase;
+		//pos = args.Position;
+		//yaw = args.Yaw;
+		//preloadTimeout = args.PreloadTimeout;
 
-		// must call before vanilla
+		// must call module code before vanilla
 		super.OnClientPrepareEvent(identity, useDB, pos, yaw, preloadTimeout);
 	}
 };

JM/CF/Scripts/5_Mission/CommunityFramework/GUI/InventoryNew/Inherited/AttachmentCategoriesRow.c

@@ -8,4 +8,4 @@ overview = "This is a Community Framework for DayZ SA. One notable feature is it
 action = "https://github.com/Jacob-Mango/DayZ-Community-Framework";
 author = "CF Mod Team";
 authorID = "76561198103677868";
-version = "0.8.100368";
+version = "1.4.2";