Expeditions rework (#18960)

Content.Shared/Salvage/Expeditions/SalvageExpeditions.cs

@@ -72,28 +72,14 @@ public sealed partial class SalvageExpeditionDataComponent : Component
 }
 
 [Serializable, NetSerializable]
-public sealed record SalvageMissionParams : IComparable<SalvageMissionParams>
+public sealed record SalvageMissionParams
 {
     [ViewVariables]
     public ushort Index;
 
-    [ViewVariables(VVAccess.ReadWrite)]
-    public SalvageMissionType MissionType;
-
     [ViewVariables(VVAccess.ReadWrite)] public int Seed;
 
-    /// <summary>
-    /// Base difficulty for this mission.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)] public DifficultyRating Difficulty;
-
-    public int CompareTo(SalvageMissionParams? other)
-    {
-        if (other == null)
-            return -1;
-
-        return Difficulty.CompareTo(other.Difficulty);
-    }
+    public string Difficulty = string.Empty;
 }
 
 /// <summary>
@@ -102,16 +88,13 @@ public sealed record SalvageMissionParams : IComparable<SalvageMissionParams>
 /// </summary>
 public sealed record SalvageMission(
     int Seed,
-    DifficultyRating Difficulty,
     string Dungeon,
     string Faction,
-    SalvageMissionType Mission,
     string Biome,
     string Air,
     float Temperature,
     Color? Color,
     TimeSpan Duration,
-    List<string> Rewards,
     List<string> Modifiers)
 {
     /// <summary>
@@ -120,12 +103,7 @@ public sealed record SalvageMission(
     public readonly int Seed = Seed;
 
     /// <summary>
-    /// Difficulty rating.
-    /// </summary>
-    public DifficultyRating Difficulty = Difficulty;
-
-    /// <summary>
-    /// <see cref="SalvageDungeonMod"/> to be used.
+    /// <see cref="SalvageDungeonModPrototype"/> to be used.
     /// </summary>
     public readonly string Dungeon = Dungeon;
 
@@ -134,11 +112,6 @@ public sealed record SalvageMission(
     /// </summary>
     public readonly string Faction = Faction;
 
-    /// <summary>
-    /// Underlying mission params that generated this.
-    /// </summary>
-    public readonly SalvageMissionType Mission = Mission;
-
     /// <summary>
     /// Biome to be used for the mission.
     /// </summary>
@@ -164,11 +137,6 @@ public sealed record SalvageMission(
     /// </summary>
     public TimeSpan Duration = Duration;
 
-    /// <summary>
-    /// The list of items to order on mission completion.
-    /// </summary>
-    public List<string> Rewards = Rewards;
-
     /// <summary>
     /// Modifiers (outside of the above) applied to the mission.
     /// </summary>