Unstable 1.8.4.0

Barotrauma/BarotraumaShared/SharedSource/Enums.cs

@@ -12,6 +12,13 @@ namespace Barotrauma
         Exponential
     }
 
+    public enum SelectedSubType
+    {
+        Shuttle,
+        Sub,
+        EnemySub
+    }
+
     /// <summary>
     /// ActionTypes define when a <see cref="StatusEffect"/> is executed.
     /// </summary>
@@ -116,6 +123,14 @@ namespace Barotrauma
         /// </summary>
         OnAbility = 23,
         /// <summary>
+        /// Executes once when a specific Containable is placed inside an ItemContainer. Only valid for Containables defined in an ItemContainer component.
+        /// </summary>
+        OnInserted = 24,
+        /// <summary>
+        /// Executes once when a specific Containable is removed from an ItemContainer. Only valid for Containables defined in an ItemContainer component.
+        /// </summary>
+        OnRemoved = 25,
+        /// <summary>
         /// Executes when the character dies. Only valid for characters.
         /// </summary>
         OnDeath = OnBroken
@@ -296,6 +311,11 @@ namespace Barotrauma
         /// </summary>
         RangedAttackSpeed,
 
+        /// <summary>
+        /// Increases the damage dealt by ranged weapons held by the character by a percentage.
+        /// </summary>
+        RangedAttackMultiplier,
+
         /// <summary>
         /// Decreases the reload time of submarine turrets operated by the character by a percentage.
         /// </summary>
@@ -588,7 +608,17 @@ namespace Barotrauma
         /// <summary>
         /// Reduces the dual wielding penalty by a percentage.
         /// </summary>
-        DualWieldingPenaltyReduction
+        DualWieldingPenaltyReduction,
+        
+        /// <summary>
+        /// Multiplier bonus to melee attacks coming from a natural weapon (limb).
+        /// </summary>
+        NaturalMeleeAttackMultiplier,
+        
+        /// <summary>
+        /// Multiplier bonus to ranged attacks coming from a natural weapon (limb).
+        /// </summary>
+        NaturalRangedAttackMultiplier
     }
 
     internal enum ItemTalentStats
@@ -599,12 +629,13 @@ namespace Barotrauma
         EngineSpeed,
         EngineMaxSpeed,
         PumpSpeed,
-        PumpMaxFlow,
         ReactorMaxOutput,
         ReactorFuelConsumption,
         DeconstructorSpeed,
         FabricationSpeed,
-        ExtraStackSize
+        ExtraStackSize,
+        [Obsolete("Use PumpSpeed instead.")]
+        PumpMaxFlow = PumpSpeed,
     }
 
     /// <summary>
@@ -723,4 +754,18 @@ namespace Barotrauma
         Local,
         Radio
     }
+    
+    public enum PvpTeamSelectionMode
+    {
+        PlayerPreference,
+        PlayerChoice,
+    }
+    
+    public enum BotStatus
+    {
+        PendingHireToActiveService,
+        PendingHireToReserveBench,
+        ActiveService,
+        ReserveBench
+    }
 }