Possible fix for design duplication bug (#199)

FrEee.WinForms/Forms/DesignListForm.cs

@@ -1,4 +1,4 @@
-using FrEee.Game.Enumerations;
+using FrEee.Game.Enumerations;
 using FrEee.Game.Interfaces;
 using FrEee.Game.Objects.Civilization;
 using FrEee.Game.Objects.Commands;
@@ -199,7 +199,7 @@ private void btnUpgrade_Click(object sender, EventArgs e)
  if (lstDesigns.SelectedItems.Count == 1)
  {
  var old = (IDesign)lstDesigns.SelectedItems[0].Tag;
- var copy = old.IsObsolescent ? old.LatestVersion : CopyDesign(old); // make sure to copy design even if it has no upgradeable parts
+ var copy = old.Upgrade();
  var form = new VehicleDesignForm();
  form.Design = copy;
  this.ShowChildForm(form);
@@ -282,4 +282,4 @@ private void btnExportAll_Click(object sender, EventArgs e)
  MessageBox.Show($"{designs.Count()} designs exported to library ({count} new).");
  }
  }
-}
+}

FrEee/Game/Interfaces/IDesign.cs

@@ -1,4 +1,4 @@
-using FrEee.Game.Enumerations;
+using FrEee.Game.Enumerations;
 using FrEee.Game.Objects.Civilization;
 using FrEee.Game.Objects.Technology;
 using FrEee.Modding.Templates;
@@ -137,10 +137,14 @@ public interface IDesign : INamed, IPictorial, IOwnableAbilityObject, IConstruct
  ICreateDesignCommand CreateCreationCommand();
 
  IVehicle Instantiate();
+
+ IDesign Upgrade();
  }
 
  public interface IDesign<out T> : IDesign, IPictorial, IReferrable, IUpgradeable<IDesign<T>> where T : IVehicle
  {
  new T Instantiate();
+
+ new IDesign<T> Upgrade();
  }
-}
+}

FrEee/Game/Objects/Vehicles/Design.cs

@@ -308,41 +308,47 @@ public bool IsObsolescent
  public int Iteration { get; set; }
 
  /// <summary>
- /// An upgraded version of this design, or this design if it cannot be upgraded.
- /// TODO - don't create upgraded design if it already exists, just return it?
+ /// The latest iteration of this design.
  /// </summary>
  public IDesign<T> LatestVersion
  {
  get
  {
- if (IsObsolescent)
- {
- var copy = this.CopyAndAssignNewID();
- copy.Hull = Hull.LatestVersion;
- copy.TurnNumber = Galaxy.Current.TurnNumber;
- copy.Owner = Empire.Current;
- copy.Iteration = Empire.Current.KnownDesigns.OwnedBy(Empire.Current).Where(x => x.BaseName == BaseName && x.IsUnlocked()).MaxOrDefault(x => x.Iteration) + 1; // auto assign nex available iteration
- copy.VehiclesBuilt = 0;
- copy.IsObsolete = false;
-
- // use real component templates and mounts from mod, not copies!
- copy.Components.Clear();
- foreach (var mct in Components)
- {
- // reuse templates so components appear "condensed" on vehicle designer
- var mount = mct.Mount == null ? null : mct.Mount.LatestVersion;
- var ct = mct.ComponentTemplate.LatestVersion;
- var same = copy.Components.FirstOrDefault(x => x.ComponentTemplate == ct && x.Mount == mount);
- if (same == null)
- copy.Components.Add(new MountedComponentTemplate(copy, ct, mount));
- else
- copy.Components.Add(same);
- }
- return copy;
- }
+ return Owner.KnownDesigns.OfType<IDesign<T>>().Where(q =>
+ q.Owner == Owner
+ && q.Name == Name
+ ).MaxBy(q => q.Iteration) ?? this;
+ }
+ }
+
+ /// <summary>
+ /// Creates an upgraded version of this design, with the latest upgraded components, etc.
+ /// </summary>
+ /// <returns></returns>
+ public IDesign<T> Upgrade()
+ {
+ var copy = this.CopyAndAssignNewID();
+ copy.Hull = Hull.LatestVersion;
+ copy.TurnNumber = Galaxy.Current.TurnNumber;
+ copy.Owner = Empire.Current;
+ copy.Iteration = Empire.Current.KnownDesigns.OwnedBy(Empire.Current).Where(x => x.BaseName == BaseName && x.IsUnlocked()).MaxOrDefault(x => x.Iteration) + 1; // auto assign nex available iteration
+ copy.VehiclesBuilt = 0;
+ copy.IsObsolete = false;
+
+ // use real component templates and mounts from mod, not copies!
+ copy.Components.Clear();
+ foreach (var mct in Components)
+ {
+ // reuse templates so components appear "condensed" on vehicle designer
+ var mount = mct.Mount == null ? null : mct.Mount.LatestVersion;
+ var ct = mct.ComponentTemplate.LatestVersion;
+ var same = copy.Components.FirstOrDefault(x => x.ComponentTemplate == ct && x.Mount == mount);
+ if (same == null)
+ copy.Components.Add(new MountedComponentTemplate(copy, ct, mount));
  else
- return this;
+ copy.Components.Add(same);
  }
+ return copy;
  }
 
  public ResourceQuantity MaintenanceCost
@@ -850,5 +856,8 @@ private IEnumerable<string> GetPaths(string pathtype)
  }
  return paths;
  }
+
+ IDesign IDesign.Upgrade()
+ => Upgrade();
  }
-}
+}

FrEee/Utility/Extensions/EnumerableExtensions.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -352,4 +352,4 @@ public static IEnumerable<T> UnionSingle<T>(this T t1, T t2)
  return list.Where(x => x.Value.SafeEquals(min)).Select(x => x.Item);
  }
  }
-}
+}