diff --git a/Subsurface/Barotrauma.csproj b/Subsurface/Barotrauma.csproj index b825317a0..23696c51d 100644 --- a/Subsurface/Barotrauma.csproj +++ b/Subsurface/Barotrauma.csproj @@ -98,6 +98,7 @@ + diff --git a/Subsurface/Content/Items/Tools/tools.xml b/Subsurface/Content/Items/Tools/tools.xml index 619f92ab2..80e3f5f3d 100644 --- a/Subsurface/Content/Items/Tools/tools.xml +++ b/Subsurface/Content/Items/Tools/tools.xml @@ -56,7 +56,7 @@ - @@ -110,7 +110,7 @@ + holdangle="30" handle1="-5,0"/> @@ -124,8 +124,10 @@ - + + + diff --git a/Subsurface/Source/Characters/Character.cs b/Subsurface/Source/Characters/Character.cs index 3248a7289..d310dfcab 100644 --- a/Subsurface/Source/Characters/Character.cs +++ b/Subsurface/Source/Characters/Character.cs @@ -405,7 +405,7 @@ namespace Barotrauma if (Info.PickedItemIDs.Any()) { - foreach (int id in Info.PickedItemIDs) + foreach (ushort id in Info.PickedItemIDs) { Item item = FindEntityByID(id) as Item; if (item == null) continue; @@ -627,7 +627,7 @@ namespace Barotrauma selectedCharacter = null; if (createNetworkEvent) - new NetworkEvent(NetworkEventType.SelectCharacter, ID, true, -1); + new NetworkEvent(NetworkEventType.SelectCharacter, ID, true, 0); } /// @@ -1075,7 +1075,7 @@ namespace Barotrauma if (GameMain.Server != null) { - new NetworkEvent(NetworkEventType.KillCharacter, ID, false); + new NetworkEvent(NetworkEventType.KillCharacter, ID, false, true); } if (GameMain.GameSession != null) @@ -1088,12 +1088,12 @@ namespace Barotrauma { if (type == NetworkEventType.PickItem) { - message.Write((int)data); + message.Write((ushort)data); return true; } else if (type== NetworkEventType.SelectCharacter) { - message.Write((int)data); + message.Write((ushort)data); return true; } else if (type == NetworkEventType.KillCharacter) @@ -1115,10 +1115,10 @@ namespace Barotrauma GetInputState(InputType.SecondaryHeld)) || LargeUpdateTimer <= 0; message.Write(hasInputs); + message.Write((float)NetTime.Now); if (!hasInputs) return true; - message.Write((float)NetTime.Now); // Write byte = move direction //message.WriteRangedSingle(MathHelper.Clamp(AnimController.TargetMovement.X, -10.0f, 10.0f), -10.0f, 10.0f, 8); @@ -1168,7 +1168,7 @@ namespace Barotrauma message.WriteRangedSingle(MathHelper.Clamp(AnimController.StunTimer,0.0f,60.0f), 0.0f, 60.0f, 8); message.Write((byte)((health/maxHealth)*255.0f)); - LargeUpdateTimer = 50; + LargeUpdateTimer = 30; } else { @@ -1189,16 +1189,9 @@ namespace Barotrauma { System.Diagnostics.Debug.WriteLine("**************** PickItem networkevent received"); - int itemId = -1; + ushort itemId = 0; - try - { - itemId = message.ReadInt32(); - } - catch - { - return; - } + itemId = message.ReadUInt16(); System.Diagnostics.Debug.WriteLine("item id: "+itemId); @@ -1212,8 +1205,8 @@ namespace Barotrauma } else if (type == NetworkEventType.SelectCharacter) { - int characterId = message.ReadInt32(); - if (characterId==-1) + ushort characterId = message.ReadUInt16(); + if (characterId==0) { DeselectCharacter(false); } @@ -1254,14 +1247,14 @@ namespace Barotrauma try { bool hasInputs = message.ReadBoolean(); - if (!hasInputs) + sendingTime = message.ReadFloat(); + + if (!hasInputs && sendingTime > LastNetworkUpdate) { ClearInputs(); return; } - sendingTime = message.ReadFloat(); - actionKeyState = message.ReadBoolean(); secondaryKeyState = message.ReadBoolean(); @@ -1321,7 +1314,7 @@ namespace Barotrauma } else { - cursorPos = Position + new Vector2(1000.0f, 0.0f) * dir; + cursorPosition = Position + new Vector2(1000.0f, 0.0f) * dir; } if (isLargeUpdate) @@ -1383,9 +1376,7 @@ namespace Barotrauma catch { return; } - Limb torso = AnimController.GetLimb(LimbType.Torso); - if (torso == null) torso = AnimController.GetLimb(LimbType.Head); - torso.body.TargetPosition = pos; + AnimController.RefLimb.body.TargetPosition = pos; LargeUpdateTimer = 0; } diff --git a/Subsurface/Source/Characters/HumanoidAnimController.cs b/Subsurface/Source/Characters/HumanoidAnimController.cs index 23b3e9c09..66055a29d 100644 --- a/Subsurface/Source/Characters/HumanoidAnimController.cs +++ b/Subsurface/Source/Characters/HumanoidAnimController.cs @@ -865,7 +865,13 @@ namespace Barotrauma Vector2 bodyVelocity = torso.body.LinearVelocity / 60.0f; item.body.ResetDynamics(); - item.SetTransform(MathUtils.SmoothStep(item.body.SimPosition, transformedHoldPos + bodyVelocity, 0.5f), itemAngle); + + Vector2 currItemPos = (character.SelectedItems[0]==item) ? + rightHand.pullJoint.WorldAnchorA - transformedHandlePos[0] : + leftHand.pullJoint.WorldAnchorA - transformedHandlePos[1]; + item.SetTransform(currItemPos, itemAngle); + + //item.SetTransform(MathUtils.SmoothStep(item.body.SimPosition, transformedHoldPos + bodyVelocity, 0.5f), itemAngle); for (int i = 0; i < 2; i++) { diff --git a/Subsurface/Source/GameMain.cs b/Subsurface/Source/GameMain.cs index 33943dfc7..95655eae0 100644 --- a/Subsurface/Source/GameMain.cs +++ b/Subsurface/Source/GameMain.cs @@ -218,8 +218,7 @@ namespace Barotrauma MainMenuScreen = new MainMenuScreen(this); LobbyScreen = new LobbyScreen(); - - NetLobbyScreen = new NetLobbyScreen(); + ServerListScreen = new ServerListScreen(); EditMapScreen = new EditMapScreen(); diff --git a/Subsurface/Source/Items/CharacterInventory.cs b/Subsurface/Source/Items/CharacterInventory.cs index c1b470c64..396aec3ed 100644 --- a/Subsurface/Source/Items/CharacterInventory.cs +++ b/Subsurface/Source/Items/CharacterInventory.cs @@ -161,9 +161,9 @@ namespace Barotrauma { //PutItem(items[i], i, false, false); Inventory otherInventory = items[i].inventory; - if (otherInventory!=null) + if (otherInventory!=null && createNetworkEvent) { - new Networking.NetworkEvent(Networking.NetworkEventType.InventoryUpdate, otherInventory.Owner.ID, true); + new Networking.NetworkEvent(Networking.NetworkEventType.InventoryUpdate, otherInventory.Owner.ID, true, true); } combined = true; @@ -263,17 +263,77 @@ namespace Barotrauma SpriteEffects.None, 0.1f); } } - + for (int i = 0; i < capacity; i++) { slotRect.X = (int)slotPositions[i].X; slotRect.Y = (int)slotPositions[i].Y; + bool multiSlot = false; + //skip if the item is in multiple slots + if (items[i]!=null) + { + for (int n = 0; n < capacity; n++ ) + { + if (i==n || items[n] != items[i]) continue; + multiSlot = true; + break; + } + } - UpdateSlot(spriteBatch, slotRect, i, items[i], i>4); + if (multiSlot) continue; + + UpdateSlot(spriteBatch, slotRect, i, items[i], i > 4); + if (draggingItem!=null && draggingItem == items[i]) draggingItemSlot = slotRect; } + + for (int i = 0; i < capacity; i++) + { + + //Rectangle multiSlotRect = Rectangle.Empty; + bool multiSlot = false; + + //check if the item is in multiple slots + if (items[i] != null) + { + slotRect.X = (int)slotPositions[i].X; + slotRect.Y = (int)slotPositions[i].Y; + slotRect.Width = 40; + slotRect.Height = 40; + + for (int n = 0; n < capacity; n++) + { + if (items[n] != items[i]) continue; + + if (!multiSlot && i > n) break; + + if (i!=n) + { + multiSlot = true; + slotRect = Rectangle.Union( + new Rectangle((int)slotPositions[n].X, (int)slotPositions[n].Y, rectWidth, rectHeight), slotRect); + } + } + } + + if (!multiSlot) continue; + + UpdateSlot(spriteBatch, slotRect, i, items[i], i > 4); + + //if (multiSlot && i == first) + //{ + // multiSlotPos = multiSlotPos / count; + // items[i].Sprite.Draw(spriteBatch, new Vector2(multiSlotPos.X + rectWidth / 2, multiSlotPos.Y + rectHeight / 2), items[i].Color); + //} + + } + + slotRect.Width = rectWidth; + slotRect.Height = rectHeight; + + if (draggingItem != null && !draggingItemSlot.Contains(PlayerInput.MousePosition)) { if (PlayerInput.GetMouseState.LeftButton == ButtonState.Pressed) diff --git a/Subsurface/Source/Items/Components/Holdable/Holdable.cs b/Subsurface/Source/Items/Components/Holdable/Holdable.cs index 9d0f8537f..99d1c7886 100644 --- a/Subsurface/Source/Items/Components/Holdable/Holdable.cs +++ b/Subsurface/Source/Items/Components/Holdable/Holdable.cs @@ -215,7 +215,7 @@ namespace Barotrauma.Items.Components attached = true; - item.NewComponentEvent(this, true); + item.NewComponentEvent(this, true, true); return true; } diff --git a/Subsurface/Source/Items/Components/Holdable/MeleeWeapon.cs b/Subsurface/Source/Items/Components/Holdable/MeleeWeapon.cs index 5c474d137..7fe6922b1 100644 --- a/Subsurface/Source/Items/Components/Holdable/MeleeWeapon.cs +++ b/Subsurface/Source/Items/Components/Holdable/MeleeWeapon.cs @@ -126,7 +126,7 @@ namespace Barotrauma.Items.Components } else { - ac.HoldItem(deltaTime, item, handlePos, new Vector2(hitPos, 0.0f), aimPos, false, 0.0f); + ac.HoldItem(deltaTime, item, handlePos, new Vector2(hitPos, 0.0f), aimPos, false, holdAngle); } } else diff --git a/Subsurface/Source/Items/Components/Machines/Engine.cs b/Subsurface/Source/Items/Components/Machines/Engine.cs index d41bb4bc4..b940fe3e1 100644 --- a/Subsurface/Source/Items/Components/Machines/Engine.cs +++ b/Subsurface/Source/Items/Components/Machines/Engine.cs @@ -93,10 +93,18 @@ namespace Barotrauma.Items.Components spriteBatch.DrawString(GUI.Font, "Force: " + (int)(targetForce) + " %", new Vector2(GuiFrame.Rect.X + 30, GuiFrame.Rect.Y + 30), Color.White); - if (GUI.DrawButton(spriteBatch, new Rectangle(GuiFrame.Rect.X + 280, GuiFrame.Rect.Y + 30, 40, 40), "+", true)) targetForce += 1.0f; - if (GUI.DrawButton(spriteBatch, new Rectangle(GuiFrame.Rect.X + 280, GuiFrame.Rect.Y + 80, 40, 40), "-", true)) targetForce -= 1.0f; + if (GUI.DrawButton(spriteBatch, new Rectangle(GuiFrame.Rect.X + 280, GuiFrame.Rect.Y + 30, 40, 40), "+", true)) + { + targetForce += 1.0f; + item.NewComponentEvent(this, true, false); + } + if (GUI.DrawButton(spriteBatch, new Rectangle(GuiFrame.Rect.X + 280, GuiFrame.Rect.Y + 80, 40, 40), "-", true)) + { + targetForce -= 1.0f; + item.NewComponentEvent(this, true, false); + } + - item.NewComponentEvent(this, true); } public override void UpdateBroken(float deltaTime, Camera cam) diff --git a/Subsurface/Source/Items/Components/Machines/Pump.cs b/Subsurface/Source/Items/Components/Machines/Pump.cs index 16b6b2e14..2efdeb34d 100644 --- a/Subsurface/Source/Items/Components/Machines/Pump.cs +++ b/Subsurface/Source/Items/Components/Machines/Pump.cs @@ -117,7 +117,7 @@ namespace Barotrauma.Items.Components targetLevel = null; IsActive = !IsActive; if (!IsActive) currPowerConsumption = 0.0f; - item.NewComponentEvent(this, true); + item.NewComponentEvent(this, true, true); } spriteBatch.DrawString(GUI.Font, "Pumping speed: " + (int)flowPercentage + " %", new Vector2(x + 20, y + 80), Color.White); @@ -125,12 +125,12 @@ namespace Barotrauma.Items.Components if (GUI.DrawButton(spriteBatch, new Rectangle(x + 200, y + 70, 40, 40), "OUT", false)) { FlowPercentage -= 10.0f; - item.NewComponentEvent(this, true); + item.NewComponentEvent(this, true, false); } if (GUI.DrawButton(spriteBatch, new Rectangle(x + 250, y + 70, 40, 40), "IN", false)) { FlowPercentage += 10.0f; - item.NewComponentEvent(this, true); + item.NewComponentEvent(this, true, false); } } diff --git a/Subsurface/Source/Items/Components/Machines/Radar.cs b/Subsurface/Source/Items/Components/Machines/Radar.cs index 5f1ceb455..0df23e5c4 100644 --- a/Subsurface/Source/Items/Components/Machines/Radar.cs +++ b/Subsurface/Source/Items/Components/Machines/Radar.cs @@ -80,7 +80,7 @@ namespace Barotrauma.Items.Components if (GUI.DrawButton(spriteBatch, new Rectangle(x + 20, y + 20, 200, 30), "Activate Radar")) { IsActive = !IsActive; - item.NewComponentEvent(this, true); + item.NewComponentEvent(this, true, false); } int radius = GuiFrame.Rect.Height / 2 - 10; diff --git a/Subsurface/Source/Items/Components/Machines/Reactor.cs b/Subsurface/Source/Items/Components/Machines/Reactor.cs index d6d03a6bb..d34334680 100644 --- a/Subsurface/Source/Items/Components/Machines/Reactor.cs +++ b/Subsurface/Source/Items/Components/Machines/Reactor.cs @@ -371,7 +371,7 @@ namespace Barotrauma.Items.Components if (valueChanged) { - item.NewComponentEvent(this, true); + item.NewComponentEvent(this, true, false); valueChanged = false; } } diff --git a/Subsurface/Source/Items/Components/Machines/Steering.cs b/Subsurface/Source/Items/Components/Machines/Steering.cs index 4fc27995a..2fb7040e4 100644 --- a/Subsurface/Source/Items/Components/Machines/Steering.cs +++ b/Subsurface/Source/Items/Components/Machines/Steering.cs @@ -97,7 +97,7 @@ namespace Barotrauma.Items.Components networkUpdateTimer -= deltaTime; if (networkUpdateTimer<=0.0f) { - item.NewComponentEvent(this, true); + item.NewComponentEvent(this, true, false); networkUpdateTimer = 1.0f; valueChanged = false; } @@ -124,7 +124,7 @@ namespace Barotrauma.Items.Components { AutoPilot = !AutoPilot; - item.NewComponentEvent(this, true); + item.NewComponentEvent(this, true, true); } GUI.DrawLine(spriteBatch, diff --git a/Subsurface/Source/Items/Components/Power/PowerContainer.cs b/Subsurface/Source/Items/Components/Power/PowerContainer.cs index 170ca3e8c..12f5bebf5 100644 --- a/Subsurface/Source/Items/Components/Power/PowerContainer.cs +++ b/Subsurface/Source/Items/Components/Power/PowerContainer.cs @@ -186,13 +186,13 @@ namespace Barotrauma.Items.Components if (GUI.DrawButton(spriteBatch, new Rectangle(x + 200, y + 90, 40, 40), "+")) { rechargeSpeed = Math.Min(rechargeSpeed + maxRechargeSpeed*0.1f, maxRechargeSpeed); - item.NewComponentEvent(this, true); + item.NewComponentEvent(this, true, false); } if (GUI.DrawButton(spriteBatch, new Rectangle(x + 250, y + 90, 40, 40), "-")) { rechargeSpeed = Math.Max(rechargeSpeed - maxRechargeSpeed * 0.1f, 0.0f); - item.NewComponentEvent(this, true); + item.NewComponentEvent(this, true, false); } } diff --git a/Subsurface/Source/Items/Components/Signal/Connection.cs b/Subsurface/Source/Items/Components/Signal/Connection.cs index 16d91ed27..2d5b64e96 100644 --- a/Subsurface/Source/Items/Components/Signal/Connection.cs +++ b/Subsurface/Source/Items/Components/Signal/Connection.cs @@ -280,7 +280,7 @@ namespace Barotrauma.Items.Components { if (!PlayerInput.LeftButtonDown()) { - panel.Item.NewComponentEvent(panel, true); + panel.Item.NewComponentEvent(panel, true, true); draggingConnected = null; } } diff --git a/Subsurface/Source/Items/Components/Signal/ConnectionPanel.cs b/Subsurface/Source/Items/Components/Signal/ConnectionPanel.cs index 478e2681d..2f4ff91f2 100644 --- a/Subsurface/Source/Items/Components/Signal/ConnectionPanel.cs +++ b/Subsurface/Source/Items/Components/Signal/ConnectionPanel.cs @@ -125,10 +125,9 @@ namespace Barotrauma.Items.Components { Wire[] wires = Array.FindAll(c.Wires, w => w != null); message.Write((byte)wires.Length); - for (int i = 0 ; i < c.Wires.Length; i++) + for (int i = 0 ; i < wires.Length; i++) { - if (c.Wires[i] == null) continue; - message.Write(c.Wires[i].Item.ID); + message.Write(wires[i].Item.ID); } } } @@ -140,26 +139,22 @@ namespace Barotrauma.Items.Components { //int wireCount = c.Wires.Length; c.ClearConnections(); - try + + byte wireCount = message.ReadByte(); + + for (int i = 0; i < wireCount; i++) { - byte wireCount = message.ReadByte(); - - for (int i = 0; i < wireCount; i++) - { - ushort wireId = message.ReadUInt16(); + ushort wireId = message.ReadUInt16(); - Item wireItem = MapEntity.FindEntityByID(wireId) as Item; - if (wireItem == null) continue; + Item wireItem = MapEntity.FindEntityByID(wireId) as Item; + if (wireItem == null) continue; - Wire wireComponent = wireItem.GetComponent(); - if (wireComponent == null) continue; + Wire wireComponent = wireItem.GetComponent(); + if (wireComponent == null) continue; - c.Wires[i] = wireComponent; - wireComponent.Connect(c, false); - } + c.Wires[i] = wireComponent; + wireComponent.Connect(c, false); } - - catch { } } } } diff --git a/Subsurface/Source/Items/Components/Signal/Wire.cs b/Subsurface/Source/Items/Components/Signal/Wire.cs index 7c6b3871b..e705e6c0a 100644 --- a/Subsurface/Source/Items/Components/Signal/Wire.cs +++ b/Subsurface/Source/Items/Components/Signal/Wire.cs @@ -123,7 +123,7 @@ namespace Barotrauma.Items.Components CleanNodes(); } - if (!loading) Item.NewComponentEvent(this, true); + if (!loading) Item.NewComponentEvent(this, true, true); } public override void Equip(Character character) @@ -200,7 +200,7 @@ namespace Barotrauma.Items.Components if (Nodes.Count > 1) { Nodes.RemoveAt(Nodes.Count - 1); - item.NewComponentEvent(this, true); + item.NewComponentEvent(this, true, true); } } @@ -409,8 +409,8 @@ namespace Barotrauma.Items.Components public override void FillNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetOutgoingMessage message) { - message.Write(Nodes.Count); - for (int i = 0; i < Nodes.Count; i++) + message.Write((byte)Math.Min(Nodes.Count, 10)); + for (int i = 0; i < Math.Min(Nodes.Count,10); i++) { message.Write(Nodes[i].X); message.Write(Nodes[i].Y); @@ -420,8 +420,8 @@ namespace Barotrauma.Items.Components public override void ReadNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetIncomingMessage message) { Nodes.Clear(); - int nodeCount = message.ReadInt32(); - for (int i = 0; i < nodeCount; i++) + int nodeCount = message.ReadByte(); + for (int i = 0; i(); + if (holdable!=null && holdable.Picker !=null) + { + float depth = Sprite.Depth; + if (holdable.Picker.SelectedItems[0]==this) + { + depth = holdable.Picker.AnimController.GetLimb(LimbType.RightHand).sprite.Depth + 0.000001f; + } + else if (holdable.Picker.SelectedItems[1] == this) + { + depth = holdable.Picker.AnimController.GetLimb(LimbType.LeftArm).sprite.Depth - 0.000001f; + } + + body.Draw(spriteBatch, prefab.sprite, color, depth); + } + else + { + body.Draw(spriteBatch, prefab.sprite, color); + } } } @@ -1149,11 +1167,12 @@ namespace Barotrauma } - public void NewComponentEvent(ItemComponent ic, bool isClient) + public void NewComponentEvent(ItemComponent ic, bool isClient, bool isImportant) { int index = components.IndexOf(ic); - new NetworkEvent(NetworkEventType.UpdateComponent, ID, isClient, index); + new NetworkEvent(isImportant ? + NetworkEventType.ImportantComponentUpdate : NetworkEventType.ComponentUpdate, ID, isClient, index); } public override bool FillNetworkData(NetworkEventType type, NetOutgoingMessage message, object data) @@ -1173,7 +1192,8 @@ namespace Barotrauma var itemContainer = GetComponent(); if (itemContainer == null || itemContainer.inventory == null) return false; return itemContainer.inventory.FillNetworkData(NetworkEventType.InventoryUpdate, message, data); - case NetworkEventType.UpdateComponent: + case NetworkEventType.ComponentUpdate: + case NetworkEventType.ImportantComponentUpdate: int componentIndex = (int)data; if (componentIndex < 0 || componentIndex >= components.Count) return false; @@ -1230,10 +1250,7 @@ namespace Barotrauma { case NetworkEventType.DropItem: Vector2 newSimPos = Vector2.Zero; - if (body != null) - { - newSimPos = new Vector2(message.ReadFloat(), message.ReadFloat()); - } + newSimPos = new Vector2(message.ReadFloat(), message.ReadFloat()); SetTransform(newSimPos, body.Rotation); Drop(null, false); break; @@ -1242,7 +1259,8 @@ namespace Barotrauma if (itemContainer == null || itemContainer.inventory == null) return; itemContainer.inventory.ReadNetworkData(NetworkEventType.DropItem, message); break; - case NetworkEventType.UpdateComponent: + case NetworkEventType.ComponentUpdate: + case NetworkEventType.ImportantComponentUpdate: int componentIndex = message.ReadByte(); if (componentIndex < 0 || componentIndex > components.Count - 1) return; components[componentIndex].ReadNetworkData(type, message); diff --git a/Subsurface/Source/Networking/BanList.cs b/Subsurface/Source/Networking/BanList.cs new file mode 100644 index 000000000..e3d64ad26 --- /dev/null +++ b/Subsurface/Source/Networking/BanList.cs @@ -0,0 +1,144 @@ +using Microsoft.Xna.Framework; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; + +namespace Barotrauma.Networking +{ + class BanList + { + const string SavePath = "Data/bannedplayers.xml"; + + private List bannedPlayers; + + private GUIFrame banFrame; + + public GUIFrame BanFrame + { + get { return banFrame; } + } + + public BanList() + { + bannedPlayers = new List(); + + if (File.Exists(SavePath)) + { + string[] lines; + try + { + lines = File.ReadAllLines(SavePath); + } + catch (Exception e) + { + DebugConsole.ThrowError("Failed to open the list of banned players in "+SavePath, e); + return; + } + + foreach (string line in lines) + { + string[] separatedLine = line.Split(','); + if (separatedLine.Length != 2) continue; + + bannedPlayers.Add(new BannedPlayer(separatedLine[0],separatedLine[1])); + } + } + } + + public void BanPlayer(string name, string ip) + { + if (bannedPlayers.FirstOrDefault(bp => bp.IP == ip)!=null) return; + + bannedPlayers.Add(new BannedPlayer(name,ip)); + } + + public bool IsBanned(string IP) + { + return bannedPlayers.FirstOrDefault(bp => bp.IP == IP)!=null; + } + + private GUIFrame CreateBanFrame() + { + banFrame = new GUIFrame(new Rectangle(0,0,GameMain.GraphicsWidth,GameMain.GraphicsHeight), Color.Black*0.3f); + + GUIFrame innerFrame = new GUIFrame(new Rectangle(0,0,300,300), null, Alignment.Center, GUI.Style, banFrame); + + new GUITextBlock(new Rectangle(0, 0, 0, 30), "Banned IPs:", GUI.Style, Alignment.Left, Alignment.Left, innerFrame, false, GUI.LargeFont); + var banList = new GUIListBox(new Rectangle(0, 30, 200, 0), GUI.Style, innerFrame); + + foreach (BannedPlayer bannedPlayer in bannedPlayers) + { + GUITextBlock textBlock = new GUITextBlock( + new Rectangle(0, 0, 0, 25), + bannedPlayer.IP+" ("+bannedPlayer.Name+")", + GUI.Style, + Alignment.Left, Alignment.Left, banList); + textBlock.Padding = new Vector4(10.0f, 0.0f, 0.0f, 0.0f); + textBlock.UserData = banList; + + var removeButton = new GUIButton(new Rectangle(0,0,100,20), "Remove", Alignment.Right, GUI.Style, textBlock); + removeButton.UserData = bannedPlayer; + removeButton.OnClicked = RemoveBan; + } + + var closeButton = new GUIButton(new Rectangle(0,0,100,20), "Close", Alignment.BottomRight, GUI.Style, innerFrame); + closeButton.OnClicked = CloseFrame; + + + return banFrame; + } + + private bool RemoveBan(GUIButton button, object obj) + { + BannedPlayer banned = obj as BannedPlayer; + if (banned == null) return false; + + bannedPlayers.Remove(banned); + + CreateBanFrame(); + + return true; + } + + private bool CloseFrame(GUIButton button, object obj) + { + banFrame = null; + + return true; + } + + public void Save() + { + List lines = new List(); + + foreach (BannedPlayer banned in bannedPlayers) + { + lines.Add(banned.Name + "," + banned.IP); + } + + try + { + File.WriteAllLines(SavePath, lines); + } + catch (Exception e) + { + DebugConsole.ThrowError("Saving the list of banned players to "+SavePath+" failed", e); + } + } + + } + + class BannedPlayer + { + public string Name; + public string IP; + + public BannedPlayer(string name, string ip) + { + this.Name = name; + this.IP = ip; + } + } +} diff --git a/Subsurface/Source/Networking/GameClient.cs b/Subsurface/Source/Networking/GameClient.cs index d919ab677..ca6d51ca0 100644 --- a/Subsurface/Source/Networking/GameClient.cs +++ b/Subsurface/Source/Networking/GameClient.cs @@ -37,7 +37,7 @@ namespace Barotrauma.Networking otherClients = new List(); - + GameMain.NetLobbyScreen = new NetLobbyScreen(); } public void ConnectToServer(string hostIP, string password = "") @@ -94,7 +94,7 @@ namespace Barotrauma.Networking { IPEndPoint = new System.Net.IPEndPoint(NetUtility.Resolve(serverIP), Port); } - catch (ArgumentNullException e) + catch (Exception e) { new GUIMessageBox("Could not connect to server", "Failed to resolve address ''"+serverIP+":"+Port+"''. Please make sure you have entered a valid IP address."); return; @@ -111,7 +111,7 @@ namespace Barotrauma.Networking DebugConsole.ThrowError("Couldn't connect to "+hostIP+". Error message: "+e.Message); Disconnect(); - GameMain.NetLobbyScreen.Select(); + GameMain.ServerListScreen.Select(); return; } @@ -291,7 +291,11 @@ namespace Barotrauma.Networking } else { - if (Screen.Selected != GameMain.GameScreen) GameMain.NetLobbyScreen.Select(); + if (Screen.Selected != GameMain.GameScreen) + { + GameMain.NetLobbyScreen = new NetLobbyScreen(); + GameMain.NetLobbyScreen.Select(); + } connected = true; } @@ -347,7 +351,7 @@ namespace Barotrauma.Networking } else if (gameStarted) { - myCharacter.SendNetworkEvent(true); + new NetworkEvent(myCharacter.ID, true); } } @@ -374,21 +378,12 @@ namespace Barotrauma.Networking client.SendMessage(message, NetDeliveryMethod.Unreliable); } } - - } NetworkEvent.events.Clear(); - - if (PlayerInput.KeyDown(Microsoft.Xna.Framework.Input.Keys.B)) - { - SendChatMessage("asdfsdaf"); - } - + // Update current time - updateTimer = DateTime.Now + updateInterval; - - + updateTimer = DateTime.Now + updateInterval; } /// @@ -440,13 +435,24 @@ namespace Barotrauma.Networking AddChatMessage(inc.ReadString(), ChatMessageType.Server); Client disconnectedClient = otherClients.Find(c => c.ID == leavingID); if (disconnectedClient != null) GameMain.NetLobbyScreen.RemovePlayer(disconnectedClient.name); + + if (!gameStarted) return; + + List crew = new List(); + foreach (Character c in Character.CharacterList) + { + if (!c.IsNetworkPlayer || !c.IsHumanoid || c.Info==null) continue; + crew.Add(c); + } + + CreateCrewFrame(crew); break; case (byte)PacketTypes.KickedOut: string msg = inc.ReadString(); - new GUIMessageBox("You have been kicked out from the server", msg); + new GUIMessageBox("Disconnected from server", msg); Disconnect(); GameMain.MainMenuScreen.Select(); @@ -588,6 +594,10 @@ namespace Barotrauma.Networking if (GameMain.GameSession!=null) GameMain.GameSession.EndShift(""); myCharacter = null; + foreach (Client c in otherClients) + { + c.character = null; + } yield return CoroutineStatus.Success; @@ -698,6 +708,8 @@ namespace Barotrauma.Networking { //AddChatMessage(message); + if (client.ServerConnection == null) return; + type = (gameStarted && myCharacter != null && myCharacter.IsDead) ? ChatMessageType.Dead : ChatMessageType.Default; ReliableMessage msg = reliableChannel.CreateMessage(); @@ -729,7 +741,7 @@ namespace Barotrauma.Networking break; case 2: msg.Write((byte)PacketTypes.NetworkEvent); - msg.Write((byte)NetworkEventType.UpdateComponent); + msg.Write((byte)NetworkEventType.ComponentUpdate); msg.Write((int)Item.itemList[Rand.Int(Item.itemList.Count)].ID); msg.Write(Rand.Int(8)); break; diff --git a/Subsurface/Source/Networking/GameServer.cs b/Subsurface/Source/Networking/GameServer.cs index 16ec29e2d..dc89bc1b4 100644 --- a/Subsurface/Source/Networking/GameServer.cs +++ b/Subsurface/Source/Networking/GameServer.cs @@ -31,6 +31,8 @@ namespace Barotrauma.Networking private TimeSpan refreshMasterInterval = new TimeSpan(0, 0, 40); private DateTime refreshMasterTimer; + + private BanList banList; private bool masterServerResponded; @@ -54,9 +56,11 @@ namespace Barotrauma.Networking public GameServer(string name, int port, bool isPublic = false, string password = "", bool attemptUPnP = false, int maxPlayers = 10) { - var endRoundButton = new GUIButton(new Rectangle(GameMain.GraphicsWidth - 290, 20, 150, 25), "End round", Alignment.TopLeft, GUI.Style, inGameHUD); + var endRoundButton = new GUIButton(new Rectangle(GameMain.GraphicsWidth - 170, 20, 150, 25), "End round", Alignment.TopLeft, GUI.Style, inGameHUD); endRoundButton.OnClicked = EndButtonHit; + banList = new BanList(); + this.name = name; this.password = password; @@ -297,7 +301,7 @@ namespace Barotrauma.Networking { if (gameStarted) { - if (myCharacter != null) myCharacter.SendNetworkEvent(true); + if (myCharacter != null) new NetworkEvent(myCharacter.ID, true); foreach (Character c in Character.CharacterList) { @@ -305,7 +309,7 @@ namespace Barotrauma.Networking if (c.SimPosition == Vector2.Zero || c.SimPosition.Length() < 100.0f) { - c.SendNetworkEvent(false); + new NetworkEvent(c.ID, false); } } } @@ -457,14 +461,6 @@ namespace Barotrauma.Networking List recipients = connectedClients.FindAll(c => c.Connection != inc.SenderConnection && c.inGame); if (recipients.Count == 0) break; - - //foreach (Client client in connectedClients) - //{ - // if (client.Connection == inc.SenderConnection) continue; - // if (!client.inGame) continue; - - // recipients.Add(client.Connection); - //} if (isReliable) { @@ -524,6 +520,13 @@ namespace Barotrauma.Networking if (inc.ReadByte() != (byte)PacketTypes.Login) return; DebugConsole.NewMessage("New player has joined the server", Color.White); + + if (banList.IsBanned(inc.SenderEndPoint.Address.ToString())) + { + inc.SenderConnection.Deny("You have been banned from the server"); + DebugConsole.NewMessage("Banned player tried to join the server", Color.Red); + return; + } if (connectedClients.Find(c => c.Connection == inc.SenderConnection)!=null) { @@ -595,6 +598,8 @@ namespace Barotrauma.Networking { disconnectedClients.Remove(existingClient); connectedClients.Add(existingClient); + + UpdateCrewFrame(); } } if (existingClient != null) @@ -617,6 +622,8 @@ namespace Barotrauma.Networking connectedClients.Add(newClient); + UpdateCrewFrame(); + inc.SenderConnection.Approve(); } @@ -737,7 +744,6 @@ namespace Barotrauma.Networking characterInfos.Add(characterInfo); } - List crew = new List(); WayPoint[] assignedWayPoints = WayPoint.SelectCrewSpawnPoints(characterInfos); for (int i = 0; i < connectedClients.Count; i++) @@ -745,8 +751,6 @@ namespace Barotrauma.Networking connectedClients[i].character = new Character( connectedClients[i].characterInfo, assignedWayPoints[i], true); connectedClients[i].character.GiveJobItems(assignedWayPoints[i]); - - crew.Add(connectedClients[i].character); } if (characterInfo != null) @@ -755,8 +759,6 @@ namespace Barotrauma.Networking Character.Controlled = myCharacter; myCharacter.GiveJobItems(assignedWayPoints[assignedWayPoints.Length - 1]); - - crew.Add(myCharacter); } yield return CoroutineStatus.Running; @@ -789,8 +791,8 @@ namespace Barotrauma.Networking } SendMessage(msg, NetDeliveryMethod.ReliableUnordered, null); - - CreateCrewFrame(crew); + + UpdateCrewFrame(); //give some time for the clients to load the map yield return new WaitForSeconds(2.0f); @@ -907,23 +909,51 @@ namespace Barotrauma.Networking } AddChatMessage(msg, ChatMessageType.Server); + + UpdateCrewFrame(); } - public void KickPlayer(string playerName) + private void UpdateCrewFrame() { - playerName = playerName.ToLower(); + List crew = new List(); + foreach (Client c in connectedClients) { - if (c.name.ToLower() == playerName) KickClient(c); - break; + if (c.character == null || !c.inGame) continue; + + crew.Add(c.character); } + + if (myCharacter != null) crew.Add(myCharacter); + + CreateCrewFrame(crew); } - private void KickClient(Client client) + public void KickPlayer(string playerName, bool ban = false) + { + playerName = playerName.ToLower(); + + Client client = connectedClients.Find( c => c.name.ToLower() == playerName || + (c.character != null && c.character.Name.ToLower() == playerName)); + + if (client == null) return; + + KickClient(client, ban); + } + + private void KickClient(Client client, bool ban = false) { if (client == null) return; - DisconnectClient(client, client.name + " has been kicked from the server", "You have been kicked from the server"); + if (ban) + { + DisconnectClient(client, client.name + " has been banned from the server", "You have been banned from the server"); + banList.BanPlayer(client.name, client.Connection.RemoteEndPoint.Address.ToString()); + } + else + { + DisconnectClient(client, client.name + " has been kicked from the server", "You have been kicked from the server"); + } } public void NewTraitor(Client traitor, Client target) @@ -999,6 +1029,32 @@ namespace Barotrauma.Networking return true; } + protected override bool SelectCrewCharacter(GUIComponent component, object obj) + { + base.SelectCrewCharacter(component, obj); + + var characterFrame = crewFrame.FindChild("selectedcharacter"); + + Character character = obj as Character; + if (obj == null) return false; + + if (character != myCharacter) + { + var kickButton = new GUIButton(new Rectangle(0, 0, 100, 20), "Kick", Alignment.BottomLeft, GUI.Style, characterFrame); + kickButton.UserData = character.Name; + kickButton.OnClicked += GameMain.NetLobbyScreen.KickPlayer; + + var banButton = new GUIButton(new Rectangle(0, 0, 100, 20), "Ban", Alignment.BottomRight, GUI.Style, characterFrame); + banButton.UserData = character.Name; + banButton.OnClicked += GameMain.NetLobbyScreen.BanPlayer; + } + + + + return true; + + } + public override void SendChatMessage(string message, ChatMessageType type = ChatMessageType.Server) { AddChatMessage(message, type); @@ -1081,7 +1137,7 @@ namespace Barotrauma.Networking private void AssignJobs() { List unassigned = new List(connectedClients); - + int[] assignedClientCount = new int[JobPrefab.List.Count]; if (characterInfo!=null) @@ -1201,7 +1257,7 @@ namespace Barotrauma.Networking break; case 1: msg.Write((byte)PacketTypes.NetworkEvent); - msg.Write((byte)NetworkEventType.UpdateComponent); + msg.Write((byte)NetworkEventType.ComponentUpdate); msg.Write((int)Item.itemList[Rand.Int(Item.itemList.Count)].ID); msg.Write(Rand.Int(8)); break; @@ -1224,6 +1280,7 @@ namespace Barotrauma.Networking public override void Disconnect() { + banList.Save(); server.Shutdown("The server has shut down"); } } diff --git a/Subsurface/Source/Networking/NetStats.cs b/Subsurface/Source/Networking/NetStats.cs index 542543e72..9d8025344 100644 --- a/Subsurface/Source/Networking/NetStats.cs +++ b/Subsurface/Source/Networking/NetStats.cs @@ -73,12 +73,12 @@ namespace Barotrauma.Networking spriteBatch.DrawString(GUI.SmallFont, "Peak received: "+graphs[(int)NetStatType.ReceivedBytes].LargestValue()+" bytes/s " + - "Avg received: " + graphs[(int)NetStatType.ReceivedBytes].LargestValue()/Graph.ArraySize + " bytes/s", + "Avg received: " + graphs[(int)NetStatType.ReceivedBytes].Average() + " bytes/s", new Vector2(rect.X + 10, rect.Y+10), Color.Cyan); spriteBatch.DrawString(GUI.SmallFont, "Peak sent: " + graphs[(int)NetStatType.SentBytes].LargestValue() + " bytes/s " + - "Avg sent: " + graphs[(int)NetStatType.SentBytes].LargestValue()/Graph.ArraySize + " bytes/s", + "Avg sent: " + graphs[(int)NetStatType.SentBytes].Average() + " bytes/s", new Vector2(rect.X + 10, rect.Y + 30), Color.Orange); spriteBatch.DrawString(GUI.SmallFont, "Peak resent: " + graphs[(int)NetStatType.ResentMessages].LargestValue() + " messages/s", @@ -107,6 +107,11 @@ namespace Barotrauma.Networking return maxValue; } + public float Average() + { + return values.Average(); + } + public void Update(float newValue) { for (int i = values.Length-1; i > 0; i--) diff --git a/Subsurface/Source/Networking/NetworkEvent.cs b/Subsurface/Source/Networking/NetworkEvent.cs index b2b3c2f94..8195c75b6 100644 --- a/Subsurface/Source/Networking/NetworkEvent.cs +++ b/Subsurface/Source/Networking/NetworkEvent.cs @@ -7,24 +7,58 @@ namespace Barotrauma.Networking enum NetworkEventType { EntityUpdate = 0, - KillCharacter = 1, - UpdateComponent = 2, - DropItem = 3, - InventoryUpdate = 4, - PickItem = 5, - UpdateProperty = 6, - WallDamage = 7, + ImportantEntityUpdate = 1, + + KillCharacter = 2, + SelectCharacter = 3, + + ComponentUpdate = 4, + ImportantComponentUpdate = 5, + + PickItem = 6, + DropItem = 7, + InventoryUpdate = 8, + + + UpdateProperty = 9, + WallDamage = 10, + - SelectCharacter = 8, - EntityUpdateLarge = 9 } class NetworkEvent { public static List events = new List(); - private static bool[] isImportant = { false, true, false, true, true, true, true, true, true, false }; - private static bool[] overridePrevious = { true, false, true, false, false, false, true, true, true, true }; + private static bool[] isImportant; + private static bool[] overridePrevious; + + static NetworkEvent() + { + isImportant = new bool[11]; + isImportant[(int)NetworkEventType.ImportantEntityUpdate] = true; + isImportant[(int)NetworkEventType.ImportantComponentUpdate] = true; + isImportant[(int)NetworkEventType.KillCharacter] = true; + isImportant[(int)NetworkEventType.SelectCharacter] = true; + + isImportant[(int)NetworkEventType.ImportantComponentUpdate] = true; + isImportant[(int)NetworkEventType.PickItem] = true; + isImportant[(int)NetworkEventType.DropItem] = true; + isImportant[(int)NetworkEventType.InventoryUpdate] = true; + + isImportant[(int)NetworkEventType.UpdateProperty] = true; + isImportant[(int)NetworkEventType.WallDamage] = true; + + overridePrevious = new bool[11]; + for (int i = 0; i < 11; i++ ) + { + overridePrevious[i] = true; + } + overridePrevious[(int)NetworkEventType.KillCharacter] = false; + + overridePrevious[(int)NetworkEventType.PickItem] = false; + overridePrevious[(int)NetworkEventType.DropItem] = false; + } private ushort id; @@ -103,6 +137,10 @@ namespace Barotrauma.Networking catch { +#if DEBUG + DebugConsole.ThrowError("Failed to write network message for entity "+e.ToString()); +#endif + return false; } @@ -121,7 +159,9 @@ namespace Barotrauma.Networking } catch { +#if DEBUG DebugConsole.ThrowError("Received invalid network message"); +#endif return false; } diff --git a/Subsurface/Source/Networking/NetworkMember.cs b/Subsurface/Source/Networking/NetworkMember.cs index 729d14b98..eb5eff609 100644 --- a/Subsurface/Source/Networking/NetworkMember.cs +++ b/Subsurface/Source/Networking/NetworkMember.cs @@ -54,7 +54,7 @@ namespace Barotrauma.Networking private bool crewFrameOpen; private GUIButton crewButton; - private GUIFrame crewFrame; + protected GUIFrame crewFrame; protected bool gameStarted; @@ -117,20 +117,21 @@ namespace Barotrauma.Networking protected void CreateCrewFrame(List crew) { - int width = 500, height = 400; + int width = 600, height = 400; crewFrame = new GUIFrame(new Rectangle(GameMain.GraphicsWidth / 2 - width / 2, GameMain.GraphicsHeight / 2 - height / 2, width, height), GUI.Style); crewFrame.Padding = new Vector4(10.0f, 10.0f, 10.0f, 10.0f); - GUIListBox crewList = new GUIListBox(new Rectangle(0, 0, 300, 300), Color.White * 0.7f, GUI.Style, crewFrame); + GUIListBox crewList = new GUIListBox(new Rectangle(0, 0, 280, 300), Color.White * 0.7f, GUI.Style, crewFrame); crewList.Padding = new Vector4(10.0f, 10.0f, 10.0f, 10.0f); - crewList.OnSelected = SelectCharacter; + crewList.OnSelected = SelectCrewCharacter; foreach (Character character in crew) { GUIFrame frame = new GUIFrame(new Rectangle(0, 0, 0, 40), Color.Transparent, null, crewList); frame.UserData = character; frame.Padding = new Vector4(5.0f, 5.0f, 5.0f, 5.0f); + frame.Color = (myCharacter == character) ? Color.Gold * 0.2f : Color.Transparent; frame.HoverColor = Color.LightGray * 0.5f; frame.SelectedColor = Color.Gold * 0.5f; @@ -142,14 +143,14 @@ namespace Barotrauma.Networking null, frame); textBlock.Padding = new Vector4(5.0f, 0.0f, 5.0f, 0.0f); - new GUIImage(new Rectangle(-10, -10, 0, 0), character.AnimController.Limbs[0].sprite, Alignment.Left, frame); + new GUIImage(new Rectangle(-10, 0, 0, 0), character.AnimController.Limbs[0].sprite, Alignment.Left, frame); } var closeButton = new GUIButton(new Rectangle(0,0, 80, 20), "Close", Alignment.BottomCenter, GUI.Style, crewFrame); closeButton.OnClicked = ToggleCrewFrame; } - private bool SelectCharacter(GUIComponent component, object obj) + protected virtual bool SelectCrewCharacter(GUIComponent component, object obj) { Character character = obj as Character; if (obj == null) return false; @@ -174,6 +175,17 @@ namespace Barotrauma.Networking return true; } + //protected void UpdateCrewFrame(List connectedClients) + //{ + // List characterList = new List(); + // foreach (Client c in connectedClients) + // { + // if (c.character != null && c.inGame) characterList.Add(c.character); + // } + + // CreateCrewFrame(characterList); + //} + public bool EnterChatMessage(GUITextBox textBox, string message) { if (string.IsNullOrWhiteSpace(message)) return false; diff --git a/Subsurface/Source/Screens/MainMenuScreen.cs b/Subsurface/Source/Screens/MainMenuScreen.cs index 44201ed49..3a9bed0be 100644 --- a/Subsurface/Source/Screens/MainMenuScreen.cs +++ b/Subsurface/Source/Screens/MainMenuScreen.cs @@ -243,6 +243,8 @@ namespace Barotrauma return false; } + GameMain.NetLobbyScreen = new NetLobbyScreen(); + GameMain.NetworkMember = new GameServer(name, port, isPublicBox.Selected, passwordBox.Text, useUpnpBox.Selected, int.Parse(maxPlayersBox.Text)); GameMain.NetLobbyScreen.IsServer = true; diff --git a/Subsurface/Source/Screens/NetLobbyScreen.cs b/Subsurface/Source/Screens/NetLobbyScreen.cs index 4e1cd1ae0..5afaf1bbc 100644 --- a/Subsurface/Source/Screens/NetLobbyScreen.cs +++ b/Subsurface/Source/Screens/NetLobbyScreen.cs @@ -467,11 +467,16 @@ namespace Barotrauma GUI.Style, Alignment.TopLeft, Alignment.TopLeft, playerFrameInner, false, GUI.LargeFont); - var kickButton = new GUIButton(new Rectangle(0, 0, 100, 20), "Kick", Alignment.BottomLeft, GUI.Style, playerFrameInner); + var kickButton = new GUIButton(new Rectangle(0, -30, 100, 20), "Kick", Alignment.BottomLeft, GUI.Style, playerFrameInner); kickButton.UserData = obj; kickButton.OnClicked += KickPlayer; kickButton.OnClicked += ClosePlayerFrame; + var banButton = new GUIButton(new Rectangle(0, 0, 100, 20), "Ban", Alignment.BottomLeft, GUI.Style, playerFrameInner); + banButton.UserData = obj; + banButton.OnClicked += BanPlayer; + banButton.OnClicked += ClosePlayerFrame; + var closeButton = new GUIButton(new Rectangle(0, 0, 100, 20), "Close", Alignment.BottomRight, GUI.Style, playerFrameInner); closeButton.OnClicked = ClosePlayerFrame; @@ -485,11 +490,20 @@ namespace Barotrauma return true; } - private bool KickPlayer(GUIButton button, object userData) + public bool KickPlayer(GUIButton button, object userData) { if (GameMain.Server == null || userData == null) return false; GameMain.Server.KickPlayer(userData.ToString()); + + return false; + } + + public bool BanPlayer(GUIButton button, object userData) + { + if (GameMain.Server == null || userData == null) return false; + + GameMain.Server.KickPlayer(userData.ToString(), true); return false; } diff --git a/Subsurface_Solution.v12.suo b/Subsurface_Solution.v12.suo index 2f3da2e21..4cd6ea86e 100644 Binary files a/Subsurface_Solution.v12.suo and b/Subsurface_Solution.v12.suo differ