Unstable 0.16.0.0

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

@@ -355,7 +355,7 @@ namespace Barotrauma
             IEnumerable<Character> crewCharacters = GameSession.GetSessionCrewCharacters();
 
             // use multipliers here so that we can easily add them together without introducing multiplicative XP stacking
-            var experienceGainMultiplier = new AbilityValue(1f);
+            var experienceGainMultiplier = new AbilityExperienceGainMultiplier(1f);
             crewCharacters.ForEach(c => c.CheckTalents(AbilityEffectType.OnAllyGainMissionExperience, experienceGainMultiplier));
             crewCharacters.ForEach(c => experienceGainMultiplier.Value += c.GetStatValue(StatTypes.MissionExperienceGainMultiplier));
 
@@ -374,11 +374,11 @@ namespace Barotrauma
 #endif
 
             // apply money gains afterwards to prevent them from affecting XP gains
-            var moneyGainMission = new AbilityValueMission(1f, this);
-            crewCharacters.ForEach(c => c.CheckTalents(AbilityEffectType.OnGainMissionMoney, moneyGainMission));
-            crewCharacters.ForEach(c => moneyGainMission.Value += c.GetStatValue(StatTypes.MissionMoneyGainMultiplier));
+            var missionMoneyGainMultiplier = new AbilityMissionMoneyGainMultiplier(this, 1f);
+            crewCharacters.ForEach(c => c.CheckTalents(AbilityEffectType.OnGainMissionMoney, missionMoneyGainMultiplier));
+            crewCharacters.ForEach(c => missionMoneyGainMultiplier.Value += c.GetStatValue(StatTypes.MissionMoneyGainMultiplier));
 
-            campaign.Money += (int)(reward * moneyGainMission.Value);
+            campaign.Money += (int)(reward * missionMoneyGainMultiplier.Value);
 
             foreach (Character character in crewCharacters)
             {
@@ -534,4 +534,16 @@ namespace Barotrauma
                 cargoRoom.Rect.Y - cargoRoom.Rect.Height + itemPrefab.Size.Y / 2);
         }
     }
+
+    class AbilityMissionMoneyGainMultiplier : AbilityObject, IAbilityValue, IAbilityMission
+    {
+        public AbilityMissionMoneyGainMultiplier(Mission mission, float moneyGainMultiplier)
+        {
+            Value = moneyGainMultiplier;
+            Mission = mission;
+        }
+        public float Value { get; set; }
+        public Mission Mission { get; set; }
+    }
+
 }

Barotrauma/BarotraumaShared/SharedSource/Events/MonsterEvent.cs

@@ -15,6 +15,7 @@ namespace Barotrauma
 
         private readonly float scatter;
         private readonly float offset;
+        private readonly float delayBetweenSpawns;
 
         private Vector2? spawnPos;
 
@@ -92,6 +93,7 @@ namespace Barotrauma
 
             offset = prefab.ConfigElement.GetAttributeFloat("offset", 0);
             scatter = Math.Clamp(prefab.ConfigElement.GetAttributeFloat("scatter", 500), 0, 3000);
+            delayBetweenSpawns = prefab.ConfigElement.GetAttributeFloat("delaybetweenspawns", 0.1f);
 
             if (GameMain.NetworkMember != null)
             {
@@ -538,7 +540,7 @@ 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);
                         }
-                    }, Rand.Range(0f, amount / 2f));
+                    }, delayBetweenSpawns * i);
                 }
             }
 

Barotrauma/BarotraumaShared/SharedSource/Events/ScriptedEvent.cs

@@ -45,6 +45,8 @@ namespace Barotrauma
 
             requiredDestinationTypes = prefab.ConfigElement.GetAttributeStringArray("requireddestinationtypes", null);
             RequireBeaconStation = prefab.ConfigElement.GetAttributeBool("requirebeaconstation", false);
+
+            GameAnalyticsManager.AddDesignEvent($"ScriptedEvent:{prefab.Identifier}:Start");
         }
 
         public void AddTarget(string tag, Entity target)
@@ -229,5 +231,11 @@ namespace Barotrauma
             }
             return false;
         }
+
+        public override void Finished()
+        {
+            base.Finished();
+            GameAnalyticsManager.AddDesignEvent($"ScriptedEvent:{prefab.Identifier}:Finished:{CurrentActionIndex}");
+        }
     }
 }