Merge branch 'new-frontiers-14:master' into 2024-04-03-Punk-Stuff

Content.Shared/Salvage/Expeditions/Modifiers/SalvageTimeMod.cs

@@ -11,13 +11,14 @@ public sealed class SalvageTimeMod : IPrototype, ISalvageMod
 
     /// <summary>
     /// Cost for difficulty modifiers.
+    /// Frontier: expedition timer min set to 900 and max to 930
     /// </summary>
     [DataField("cost")]
     public float Cost { get; private set; }
 
     [DataField("minDuration")]
-    public int MinDuration = 630;
+    public int MinDuration = 900;
 
     [DataField("maxDuration")]
-    public int MaxDuration = 570;
+    public int MaxDuration = 930;
 }

Content.Shared/Salvage/SharedSalvageSystem.cs

@@ -194,24 +194,27 @@ private List<string> GetRewards(DifficultyRating difficulty, System.Random rand)
 
     /// <summary>
     /// Get a list of WeightedRandomEntityPrototype IDs with the rewards for a certain difficulty.
+    /// Frontier: added uncommon and legendary reward tiers, limited amount of rewards to 1 per difficulty rating
     /// </summary>
     private string[] RewardsForDifficulty(DifficultyRating rating)
     {
         var common = "SalvageRewardCommon";
+        var uncommon = "SalvageRewardUncommon";
         var rare = "SalvageRewardRare";
         var epic = "SalvageRewardEpic";
+        var legendary = "SalvageRewardLegendary";
         switch (rating)
         {
             case DifficultyRating.Minimal:
-                return new string[] { common, common, common };
+                return new string[] { common };
             case DifficultyRating.Minor:
-                return new string[] { common, common, rare };
+                return new string[] { uncommon };
             case DifficultyRating.Moderate:
-                return new string[] { common, rare, rare };
+                return new string[] { rare };
             case DifficultyRating.Hazardous:
-                return new string[] { rare, rare, rare, epic };
+                return new string[] { epic };
             case DifficultyRating.Extreme:
-                return new string[] { rare, rare, epic, epic, epic };
+                return new string[] { legendary };
             default:
                 throw new NotImplementedException();
         }

Resources/Changelog/Changelog.yml

@@ -4399,3 +4399,39 @@ Entries:
         NFSD, as long as they are alive, for NFSD coins.
   id: 4961
   time: '2024-04-29T17:48:22.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Add
+      message: Added goblin speech bubble.
+    - type: Tweak
+      message: Added to goblins low tolerance for cleanliness.
+    - type: Tweak
+      message: Goblins are less affected by slowdown from wounds.
+  id: 4962
+  time: '2024-04-29T20:02:58.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Tweak
+      message: >-
+        Salvage expedition dungeons now feature a more varied loot/fluff items
+        pool.
+    - type: Tweak
+      message: Extended salvage expeditions time limit to 15 minutes.
+    - type: Tweak
+      message: >-
+        Limited rewards for completed expeditions to cash only, sum depends on
+        expedition difficulty.
+    - type: Tweak
+      message: Edible food can not be found in salvage expedition dungeons anymore.
+    - type: Add
+      message: Added new salvage expedition dungeon theme - Virology Lab.
+    - type: Add
+      message: >-
+        Added weapon cases. Guns and energy melee weapons on expeditions now
+        spawn in weapon cases with spare magazines.
+    - type: Tweak
+      message: >-
+        Duffel bags with shuttle guns were replaced with newly added weapon
+        cases.
+  id: 4963
+  time: '2024-04-29T21:36:47.0000000+00:00'