(bf212a41f) v0.9.2.0 pre-release test version

2019-07-27 21:06:07 +03:00
parent afa2137bd2
commit 0f63da27b2
154 changed files with 3959 additions and 1428 deletions
@@ -35,7 +35,8 @@ namespace Barotrauma.Networking
        CHAT_MESSAGE,   //also self-explanatory
        VOTE,           //you get the idea
        CHARACTER_INPUT,
-        ENTITY_STATE
+        ENTITY_STATE,
+        SPECTATING_POS
    }

    enum ClientNetError
@@ -168,7 +169,13 @@ namespace Barotrauma.Networking
                updateInterval = new TimeSpan(0, 0, 0, 0, MathHelper.Clamp(1000 / serverSettings.TickRate, 1, 500));
            }
        }
-        
+
+        public KarmaManager KarmaManager
+        {
+            get;
+            private set;
+        } = new KarmaManager();
+
        public string Name
        {
            get { return name; }
@@ -214,7 +221,7 @@ namespace Barotrauma.Networking
                       
            var radioComponent = radio.GetComponent<WifiComponent>();
            if (radioComponent == null) return false;
-            return radioComponent.HasRequiredContainedItems(false);
+            return radioComponent.HasRequiredContainedItems(sender, addMessage: false);
        }

        public void AddChatMessage(string message, ChatMessageType type, string senderName = "", Character senderCharacter = null)