Unstable 0.16.1.0

Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/MoneyAction.cs

@@ -28,6 +28,7 @@ namespace Barotrauma
             if (GameMain.GameSession?.GameMode is CampaignMode campaign)
             {
                 campaign.Money += Amount;
+                GameAnalyticsManager.AddMoneyGainedEvent(Amount, GameAnalyticsManager.MoneySource.Event, ParentEvent.Prefab.Identifier);
 #if SERVER
                 (campaign as MultiPlayerCampaign).LastUpdateID++;
 #endif

Barotrauma/BarotraumaShared/SharedSource/Events/Missions/AbandonedOutpostMission.cs

@@ -152,7 +152,7 @@ namespace Barotrauma
                     if (spawnPoint is WayPoint wp && wp.CurrentHull != null && wp.CurrentHull.Rect.Width > 100)
                     {
                         spawnPos = new Vector2(
-                            MathHelper.Clamp(wp.WorldPosition.X + Rand.Range(-200, 200), wp.CurrentHull.WorldRect.X + 50, wp.CurrentHull.WorldRect.Right - 50),
+                            MathHelper.Clamp(wp.WorldPosition.X + Rand.Range(-200, 201), wp.CurrentHull.WorldRect.X + 50, wp.CurrentHull.WorldRect.Right - 50),
                             wp.CurrentHull.WorldRect.Y - wp.CurrentHull.Rect.Height + 16.0f);
                     }
                     var item = new Item(itemPrefab, spawnPos, null);

Barotrauma/BarotraumaShared/SharedSource/Events/Missions/EscortMission.cs

@@ -319,6 +319,19 @@ namespace Barotrauma
                 }
             }
 
+            foreach (Character character in characters)
+            {
+                if (character.Inventory == null) { continue; }
+                foreach (Item item in character.Inventory.AllItemsMod)
+                {
+                    //item didn't spawn with the characters -> drop it
+                    if (!characterItems.Any(c => c.Value.Contains(item)))
+                    {
+                        item.Drop(character);
+                    }
+                }
+            }
+
             // characters that survived will take their items with them, in case players tried to be crafty and steal them
             // this needs to run here in case players abort the mission by going back home
             // TODO: I think this might feel like a bug.

Barotrauma/BarotraumaShared/SharedSource/Events/Missions/Mission.cs

@@ -378,7 +378,10 @@ namespace Barotrauma
             crewCharacters.ForEach(c => c.CheckTalents(AbilityEffectType.OnGainMissionMoney, missionMoneyGainMultiplier));
             crewCharacters.ForEach(c => missionMoneyGainMultiplier.Value += c.GetStatValue(StatTypes.MissionMoneyGainMultiplier));
 
-            campaign.Money += (int)(reward * missionMoneyGainMultiplier.Value);
+            int totalReward = (int)(reward * missionMoneyGainMultiplier.Value);
+            campaign.Money += totalReward;
+
+            GameAnalyticsManager.AddMoneyGainedEvent(totalReward, GameAnalyticsManager.MoneySource.MissionReward, Prefab.Identifier);
 
             foreach (Character character in crewCharacters)
             {

Barotrauma/BarotraumaShared/SharedSource/Events/MonsterEvent.cs

@@ -328,7 +328,7 @@ namespace Barotrauma
                         }
                         else
                         {
-                            dir = new Vector2(1, Rand.Range(-1, 1));
+                            dir = new Vector2(1, Rand.Range(-1f, 1f));
                         }
                         Vector2 targetPos = spawnPos.Value + dir * offset;
                         var targetWaypoint = waypoints.OrderBy(wp => Vector2.DistanceSquared(wp.WorldPosition, targetPos)).FirstOrDefault();
@@ -475,6 +475,7 @@ namespace Barotrauma
                 {
                     scatterAmount = 0;
                 }
+
                 for (int i = 0; i < amount; i++)
                 {
                     string seed = Level.Loaded.Seed + i.ToString();
@@ -540,6 +541,13 @@ namespace Barotrauma
                             SwarmBehavior.CreateSwarm(monsters.Cast<AICharacter>());
                             DebugConsole.NewMessage($"Spawned: {ToString()}. Strength: {StringFormatter.FormatZeroDecimal(monsters.Sum(m => m.Params.AI.CombatStrength))}.", Color.LightBlue, debugOnly: true);
                         }
+
+                        if (GameMain.GameSession != null)
+                        {
+                            GameAnalyticsManager.AddDesignEvent(
+                                $"MonsterSpawn:{GameMain.GameSession.GameMode?.Preset?.Identifier ?? "none"}:{Level.Loaded?.LevelData?.Biome?.Identifier ?? "none"}:{SpawnPosType}:{speciesName}",
+                                value: Timing.TotalTime - GameMain.GameSession.RoundStartTime);
+                        }
                     }, delayBetweenSpawns * i);
                 }
             }