#632 - add new vehicle designs to the game when they are being added to construction queues if they don't exist there already

Author: ekolis

FrEee.Core.Domain/Objects/Civilization/Orders/ConstructionOrder.cs

@@ -70,7 +70,7 @@ public string Name
     {
         get
         {
-            return Template.Name;
+            return Template?.Name ?? "(no template)";
         }
     }
 

FrEee.Plugins.Default.Processes/Construction/ConstructionQueue.cs

@@ -143,15 +143,32 @@ public Image FirstItemIcon
 	{
 		get
 		{
-			return Orders.FirstOrDefault()?.Template.Icon ?? Pictures.GetSolidColorImage(Color.Transparent);
+			var blankImage = Pictures.GetSolidColorImage(Color.Transparent);
+			try
+			{
+				return Orders?.FirstOrDefault()?.Template?.Icon ?? blankImage;
+			}
+			catch (Exception ex)
+			{
+				Console.Error.WriteLine(ex);
+				return blankImage;
+			}
 		}
 	}
 
 	public string? FirstItemName
 	{
 		get
 		{
-			return Orders.FirstOrDefault()?.Template.Name;
+			try
+			{
+				return Orders?.FirstOrDefault()?.Template?.Name;
+			}
+			catch (Exception ex)
+			{
+				Console.Error.WriteLine(ex);
+				return null;
+			}
 		}
 	}
 

FrEee.Plugins.Default.Vehicles/Design.cs

@@ -629,11 +629,8 @@ public void Clean()
 
 	public IConstructionOrder CreateConstructionOrder(IConstructionQueue queue)
 	{
-		var dtype = GetType();
-		var vtype = dtype.GetGenericArguments()[0];
-		var ordertype = typeof(ConstructionOrder<,>).MakeGenericType(vtype, dtype);
-		var o = (IConstructionOrder)Activator.CreateInstance(ordertype);
-		o.GetType().GetProperty("Template").SetValue(o, this, new object[] { });
+		var o = new ConstructionOrder<T, Design<T>>();
+		o.Template = this;
 		return o;
 	}
 

FrEee.UI.WinForms/Forms/ConstructionQueueForm.cs

@@ -231,7 +231,7 @@ private void BindQueueListView(IEnumerable<IConstructionOrder> selected = null)
 					fore = lstQueue.BackColor;
 				item.SubItems.Add(new ListViewItem.ListViewSubItem(item, firstEta.CeilingString(1) + "(" + eta.CeilingString(1) + ")", fore, back, lstQueue.Font));
 				item.ImageIndex = i;
-				il.Images.Add(order.Template.Icon);
+				il.Images.Add(order.Template?.Icon ?? Pictures.GetSolidColorImage(Color.Transparent));
 				lstQueue.Items.Add(item);
 				i++;
 			}
@@ -751,12 +751,18 @@ private void lstShips_MouseDown(object sender, MouseEventArgs e)
 					amount *= 100;
 
 				// is this a new design we've never built before? then tell the server about it
+				var isNewDesign = false;
 				if (design.ID <= 0)
 				{
 					Game.Current.AssignID(design);
-					design.IsNew = true;
+					design.IsNew = isNewDesign = true;
+				}
+				if (!Game.Current.Designs.Contains(design))
+				{
+					Game.Current.Designs.Add(design);
+					design.IsNew = isNewDesign = true;
 				}
-				if (design.IsNew && !BuildingAnywhere(design))
+				if (isNewDesign)
 				{
 					Empire.Current.Commands.Add(design.CreateCreationCommand());
 				}