diff --git a/BarotraumaClient/BarotraumaClient.csproj b/BarotraumaClient/BarotraumaClient.csproj
index debbea126..50f7f43e8 100644
--- a/BarotraumaClient/BarotraumaClient.csproj
+++ b/BarotraumaClient/BarotraumaClient.csproj
@@ -68,10 +68,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -89,10 +106,19 @@
+
+
+
+
+
+
+
+
+
diff --git a/BarotraumaClient/Source/Characters/Character.cs b/BarotraumaClient/Source/Characters/Character.cs
new file mode 100644
index 000000000..f55956cac
--- /dev/null
+++ b/BarotraumaClient/Source/Characters/Character.cs
@@ -0,0 +1,256 @@
+using FarseerPhysics;
+using FarseerPhysics.Dynamics;
+using FarseerPhysics.Dynamics.Joints;
+using Barotrauma.Networking;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Xml.Linq;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+using Barotrauma.Particles;
+
+namespace Barotrauma
+{
+ partial class Character : Entity, IDamageable, IPropertyObject, IClientSerializable, IServerSerializable
+ {
+ private List sounds;
+
+ //the Character that the player is currently controlling
+ private static Character controlled;
+
+ public static Character Controlled
+ {
+ get { return controlled; }
+ set
+ {
+ if (controlled == value) return;
+ controlled = value;
+ CharacterHUD.Reset();
+
+ if (controlled != null)
+ {
+ controlled.Enabled = true;
+ }
+ }
+ }
+
+ private Dictionary hudProgressBars;
+
+ public Dictionary HUDProgressBars
+ {
+ get { return hudProgressBars; }
+ }
+
+ private void InitProjSpecific(XDocument doc)
+ {
+ for (int i = 0; i < Enum.GetNames(typeof(InputType)).Length; i++)
+ {
+ keys[i] = new Key(GameMain.Config.KeyBind((InputType)i));
+ }
+
+ var soundElements = doc.Root.Elements("sound").ToList();
+
+ sounds = new List();
+ foreach (XElement soundElement in soundElements)
+ {
+ sounds.Add(new CharacterSound(soundElement));
+ }
+
+ hudProgressBars = new Dictionary();
+ }
+
+ public static void AddAllToGUIUpdateList()
+ {
+ for (int i = 0; i < CharacterList.Count; i++)
+ {
+ CharacterList[i].AddToGUIUpdateList();
+ }
+ }
+
+ public virtual void AddToGUIUpdateList()
+ {
+ if (controlled == this)
+ {
+ CharacterHUD.AddToGUIUpdateList(this);
+ }
+ }
+
+ private void UpdateControlled(float deltaTime)
+ {
+ if (controlled == this)
+ {
+ Lights.LightManager.ViewTarget = this;
+ CharacterHUD.Update(deltaTime, this);
+
+ foreach (HUDProgressBar progressBar in hudProgressBars.Values)
+ {
+ progressBar.Update(deltaTime);
+ }
+
+ foreach (var pb in hudProgressBars.Where(pb => pb.Value.FadeTimer <= 0.0f).ToList())
+ {
+ hudProgressBars.Remove(pb.Key);
+ }
+ }
+ }
+
+ public void Draw(SpriteBatch spriteBatch)
+ {
+ if (!Enabled) return;
+
+ AnimController.Draw(spriteBatch);
+ }
+
+ public void DrawHUD(SpriteBatch spriteBatch, Camera cam)
+ {
+ CharacterHUD.Draw(spriteBatch, this, cam);
+ }
+
+ public virtual void DrawFront(SpriteBatch spriteBatch, Camera cam)
+ {
+ if (!Enabled) return;
+
+ if (GameMain.DebugDraw)
+ {
+ AnimController.DebugDraw(spriteBatch);
+
+ if (aiTarget != null) aiTarget.Draw(spriteBatch);
+ }
+
+ /*if (memPos != null && memPos.Count > 0 && controlled == this)
+ {
+ PosInfo serverPos = memPos.Last();
+ Vector2 remoteVec = ConvertUnits.ToDisplayUnits(serverPos.Position);
+ if (Submarine != null)
+ {
+ remoteVec += Submarine.DrawPosition;
+ }
+ remoteVec.Y = -remoteVec.Y;
+
+ PosInfo localPos = memLocalPos.Find(m => m.ID == serverPos.ID);
+ int mpind = memLocalPos.FindIndex(lp => lp.ID == localPos.ID);
+ PosInfo localPos1 = mpind > 0 ? memLocalPos[mpind - 1] : null;
+ PosInfo localPos2 = mpind < memLocalPos.Count-1 ? memLocalPos[mpind + 1] : null;
+
+ Vector2 localVec = ConvertUnits.ToDisplayUnits(localPos.Position);
+ Vector2 localVec1 = localPos1 != null ? ConvertUnits.ToDisplayUnits(((PosInfo)localPos1).Position) : Vector2.Zero;
+ Vector2 localVec2 = localPos2 != null ? ConvertUnits.ToDisplayUnits(((PosInfo)localPos2).Position) : Vector2.Zero;
+ if (Submarine != null)
+ {
+ localVec += Submarine.DrawPosition;
+ localVec1 += Submarine.DrawPosition;
+ localVec2 += Submarine.DrawPosition;
+ }
+ localVec.Y = -localVec.Y;
+ localVec1.Y = -localVec1.Y;
+ localVec2.Y = -localVec2.Y;
+
+ //GUI.DrawLine(spriteBatch, remoteVec, localVec, Color.Yellow, 0, 10);
+ if (localPos1 != null) GUI.DrawLine(spriteBatch, remoteVec, localVec1, Color.Lime, 0, 2);
+ if (localPos2 != null) GUI.DrawLine(spriteBatch, remoteVec + Vector2.One, localVec2 + Vector2.One, Color.Red, 0, 2);
+ }
+
+ Vector2 mouseDrawPos = CursorWorldPosition;
+ mouseDrawPos.Y = -mouseDrawPos.Y;
+ GUI.DrawLine(spriteBatch, mouseDrawPos - new Vector2(0, 5), mouseDrawPos + new Vector2(0, 5), Color.Red, 0, 10);
+
+ Vector2 closestItemPos = closestItem != null ? closestItem.DrawPosition : Vector2.Zero;
+ closestItemPos.Y = -closestItemPos.Y;
+ GUI.DrawLine(spriteBatch, closestItemPos - new Vector2(0, 5), closestItemPos + new Vector2(0, 5), Color.Lime, 0, 10);*/
+
+ if (this == controlled || GUI.DisableHUD) return;
+
+ Vector2 pos = DrawPosition;
+ pos.Y = -pos.Y;
+
+ if (speechBubbleTimer > 0.0f)
+ {
+ GUI.SpeechBubbleIcon.Draw(spriteBatch, pos - Vector2.UnitY * 100.0f,
+ speechBubbleColor * Math.Min(speechBubbleTimer, 1.0f), 0.0f,
+ Math.Min((float)speechBubbleTimer, 1.0f));
+ }
+
+ if (this == controlled) return;
+
+ if (info != null)
+ {
+ Vector2 namePos = new Vector2(pos.X, pos.Y - 110.0f - (5.0f / cam.Zoom)) - GUI.Font.MeasureString(Info.Name) * 0.5f / cam.Zoom;
+ Color nameColor = Color.White;
+
+ if (Character.Controlled != null && TeamID != Character.Controlled.TeamID)
+ {
+ nameColor = Color.Red;
+ }
+ GUI.Font.DrawString(spriteBatch, Info.Name, namePos + new Vector2(1.0f / cam.Zoom, 1.0f / cam.Zoom), Color.Black, 0.0f, Vector2.Zero, 1.0f / cam.Zoom, SpriteEffects.None, 0.001f);
+ GUI.Font.DrawString(spriteBatch, Info.Name, namePos, nameColor, 0.0f, Vector2.Zero, 1.0f / cam.Zoom, SpriteEffects.None, 0.0f);
+
+ if (GameMain.DebugDraw)
+ {
+ GUI.Font.DrawString(spriteBatch, ID.ToString(), namePos - new Vector2(0.0f, 20.0f), Color.White);
+ }
+ }
+
+ if (isDead) return;
+
+ if (health < maxHealth * 0.98f)
+ {
+ Vector2 healthBarPos = new Vector2(pos.X - 50, DrawPosition.Y + 100.0f);
+
+ GUI.DrawProgressBar(spriteBatch, healthBarPos, new Vector2(100.0f, 15.0f), health / maxHealth, Color.Lerp(Color.Red, Color.Green, health / maxHealth) * 0.8f);
+ }
+ }
+
+ ///
+ /// Creates a progress bar that's "linked" to the specified object (or updates an existing one if there's one already linked to the object)
+ /// The progress bar will automatically fade out after 1 sec if the method hasn't been called during that time
+ ///
+ public HUDProgressBar UpdateHUDProgressBar(object linkedObject, Vector2 worldPosition, float progress, Color emptyColor, Color fullColor)
+ {
+ if (controlled != this) return null;
+
+ HUDProgressBar progressBar = null;
+ if (!hudProgressBars.TryGetValue(linkedObject, out progressBar))
+ {
+ progressBar = new HUDProgressBar(worldPosition, Submarine, emptyColor, fullColor);
+ hudProgressBars.Add(linkedObject, progressBar);
+ }
+
+ progressBar.WorldPosition = worldPosition;
+ progressBar.FadeTimer = Math.Max(progressBar.FadeTimer, 1.0f);
+ progressBar.Progress = progress;
+
+ return progressBar;
+ }
+
+ public void PlaySound(CharacterSound.SoundType soundType)
+ {
+ if (sounds == null || sounds.Count == 0) return;
+
+ var matchingSounds = sounds.FindAll(s => s.Type == soundType);
+ if (matchingSounds.Count == 0) return;
+
+ var selectedSound = matchingSounds[Rand.Int(matchingSounds.Count)];
+ selectedSound.Sound.Play(1.0f, selectedSound.Range, AnimController.WorldPosition);
+ }
+
+ private void ImplodeFX()
+ {
+ Vector2 centerOfMass = AnimController.GetCenterOfMass();
+
+ SoundPlayer.PlaySound("implode", 1.0f, 150.0f, WorldPosition);
+
+ for (int i = 0; i < 10; i++)
+ {
+ Particle p = GameMain.ParticleManager.CreateParticle("waterblood",
+ ConvertUnits.ToDisplayUnits(centerOfMass) + Rand.Vector(5.0f),
+ Rand.Vector(10.0f));
+ if (p != null) p.Size *= 2.0f;
+
+ GameMain.ParticleManager.CreateParticle("bubbles",
+ ConvertUnits.ToDisplayUnits(centerOfMass) + Rand.Vector(5.0f),
+ new Vector2(Rand.Range(-50f, 50f), Rand.Range(-100f, 50f)));
+ }
+ }
+ }
+}
diff --git a/BarotraumaShared/Source/Characters/CharacterHUD.cs b/BarotraumaClient/Source/Characters/CharacterHUD.cs
similarity index 100%
rename from BarotraumaShared/Source/Characters/CharacterHUD.cs
rename to BarotraumaClient/Source/Characters/CharacterHUD.cs
diff --git a/BarotraumaClient/Source/Characters/CharacterInfo.cs b/BarotraumaClient/Source/Characters/CharacterInfo.cs
new file mode 100644
index 000000000..348b94069
--- /dev/null
+++ b/BarotraumaClient/Source/Characters/CharacterInfo.cs
@@ -0,0 +1,75 @@
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Xml.Linq;
+
+namespace Barotrauma
+{
+ partial class CharacterInfo
+ {
+
+ public GUIFrame CreateInfoFrame(Rectangle rect)
+ {
+ GUIFrame frame = new GUIFrame(rect, Color.Transparent);
+ frame.Padding = new Vector4(10.0f, 10.0f, 10.0f, 10.0f);
+
+ return CreateInfoFrame(frame);
+ }
+
+ public GUIFrame CreateInfoFrame(GUIFrame frame)
+ {
+ new GUIImage(new Rectangle(0, 0, 30, 30), HeadSprite, Alignment.TopLeft, frame);
+
+ ScalableFont font = frame.Rect.Width < 280 ? GUI.SmallFont : GUI.Font;
+
+ int x = 0, y = 0;
+ new GUITextBlock(new Rectangle(x + 60, y, 200, 20), Name, "", frame, font);
+ y += 20;
+
+ if (Job != null)
+ {
+ new GUITextBlock(new Rectangle(x + 60, y, 200, 20), Job.Name, "", frame, font);
+ y += 30;
+
+ var skills = Job.Skills;
+ skills.Sort((s1, s2) => -s1.Level.CompareTo(s2.Level));
+
+ new GUITextBlock(new Rectangle(x, y, 200, 20), "Skills:", "", frame, font);
+ y += 20;
+ foreach (Skill skill in skills)
+ {
+ Color textColor = Color.White * (0.5f + skill.Level / 200.0f);
+ new GUITextBlock(new Rectangle(x, y, 200, 20), skill.Name, Color.Transparent, textColor, Alignment.Left, "", frame).Font = font;
+ new GUITextBlock(new Rectangle(x, y, 200, 20), skill.Level.ToString(), Color.Transparent, textColor, Alignment.Right, "", frame).Font = font;
+ y += 20;
+ }
+ }
+
+
+ return frame;
+ }
+
+ public GUIFrame CreateCharacterFrame(GUIComponent parent, string text, object userData)
+ {
+ GUIFrame frame = new GUIFrame(new Rectangle(0, 0, 0, 40), Color.Transparent, "ListBoxElement", parent);
+ frame.UserData = userData;
+
+ GUITextBlock textBlock = new GUITextBlock(
+ new Rectangle(40, 0, 0, 25),
+ text,
+ null, null,
+ Alignment.Left, Alignment.Left,
+ "", frame, false);
+ textBlock.Font = GUI.SmallFont;
+ textBlock.Padding = new Vector4(5.0f, 0.0f, 5.0f, 0.0f);
+
+ new GUIImage(new Rectangle(-5, -5, 0, 0), HeadSprite, Alignment.Left, frame);
+
+ return frame;
+ }
+
+ }
+}
diff --git a/BarotraumaShared/Source/Characters/CharacterSound.cs b/BarotraumaClient/Source/Characters/CharacterSound.cs
similarity index 100%
rename from BarotraumaShared/Source/Characters/CharacterSound.cs
rename to BarotraumaClient/Source/Characters/CharacterSound.cs
diff --git a/BarotraumaShared/Source/Characters/HUDProgressBar.cs b/BarotraumaClient/Source/Characters/HUDProgressBar.cs
similarity index 100%
rename from BarotraumaShared/Source/Characters/HUDProgressBar.cs
rename to BarotraumaClient/Source/Characters/HUDProgressBar.cs
diff --git a/BarotraumaClient/Source/Characters/Jobs/JobPrefab.cs b/BarotraumaClient/Source/Characters/Jobs/JobPrefab.cs
new file mode 100644
index 000000000..71ece5041
--- /dev/null
+++ b/BarotraumaClient/Source/Characters/Jobs/JobPrefab.cs
@@ -0,0 +1,57 @@
+using Microsoft.Xna.Framework;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Xml.Linq;
+using System.Linq;
+
+namespace Barotrauma
+{
+ partial class JobPrefab
+ {
+ public GUIFrame CreateInfoFrame()
+ {
+ int width = 500, height = 400;
+
+ GUIFrame backFrame = new GUIFrame(Rectangle.Empty, Color.Black * 0.5f);
+ backFrame.Padding = Vector4.Zero;
+
+ GUIFrame frame = new GUIFrame(new Rectangle(GameMain.GraphicsWidth / 2 - width / 2, GameMain.GraphicsHeight / 2 - height / 2, width, height), "", backFrame);
+ frame.Padding = new Vector4(30.0f, 30.0f, 30.0f, 30.0f);
+
+ new GUITextBlock(new Rectangle(0, 0, 100, 20), Name, "", Alignment.TopLeft, Alignment.TopLeft, frame, false, GUI.LargeFont);
+
+ var descriptionBlock = new GUITextBlock(new Rectangle(0, 40, 0, 0), Description, "", Alignment.TopLeft, Alignment.TopLeft, frame, true, GUI.SmallFont);
+
+ new GUITextBlock(new Rectangle(0, 40 + descriptionBlock.Rect.Height + 20, 100, 20), "Skills: ", "", Alignment.TopLeft, Alignment.TopLeft, frame, false, GUI.LargeFont);
+
+ int y = 40 + descriptionBlock.Rect.Height + 50;
+ foreach (SkillPrefab skill in Skills)
+ {
+ string skillDescription = Skill.GetLevelName((int)skill.LevelRange.X);
+ string skillDescription2 = Skill.GetLevelName((int)skill.LevelRange.Y);
+
+ if (skillDescription2 != skillDescription)
+ {
+ skillDescription += "/" + skillDescription2;
+ }
+ new GUITextBlock(new Rectangle(0, y, 100, 20),
+ " - " + skill.Name + ": " + skillDescription, "", Alignment.TopLeft, Alignment.TopLeft, frame, false, GUI.SmallFont);
+
+ y += 20;
+ }
+
+ new GUITextBlock(new Rectangle(250, 40 + descriptionBlock.Rect.Height + 20, 0, 20), "Items: ", "", Alignment.TopLeft, Alignment.TopLeft, frame, false, GUI.LargeFont);
+
+ y = 40 + descriptionBlock.Rect.Height + 50;
+ foreach (string itemName in ItemNames)
+ {
+ new GUITextBlock(new Rectangle(250, y, 100, 20),
+ " - " + itemName, "", Alignment.TopLeft, Alignment.TopLeft, frame, false, GUI.SmallFont);
+
+ y += 20;
+ }
+
+ return backFrame;
+ }
+ }
+}
diff --git a/BarotraumaClient/Source/Characters/Limb.cs b/BarotraumaClient/Source/Characters/Limb.cs
new file mode 100644
index 000000000..1e5fe7d4c
--- /dev/null
+++ b/BarotraumaClient/Source/Characters/Limb.cs
@@ -0,0 +1,95 @@
+using System;
+using System.Xml.Linq;
+using FarseerPhysics;
+using FarseerPhysics.Dynamics;
+using FarseerPhysics.Dynamics.Joints;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+using Barotrauma.Items.Components;
+using System.Collections.Generic;
+using Barotrauma.Lights;
+using System.Linq;
+using System.IO;
+
+namespace Barotrauma
+{
+ partial class Limb
+ {
+ Sound hitSound;
+
+ public Sound HitSound
+ {
+ get { return hitSound; }
+ }
+
+ public void Draw(SpriteBatch spriteBatch)
+ {
+ float brightness = 1.0f - (burnt / 100.0f) * 0.5f;
+ Color color = new Color(brightness, brightness, brightness);
+
+ body.Dir = Dir;
+
+ bool hideLimb = wearingItems.Any(w => w != null && w.HideLimb);
+
+ if (!hideLimb)
+ {
+ body.Draw(spriteBatch, sprite, color, null, scale);
+ }
+ else
+ {
+ body.UpdateDrawPosition();
+ }
+
+ if (LightSource != null)
+ {
+ LightSource.Position = body.DrawPosition;
+ }
+
+ foreach (WearableSprite wearable in wearingItems)
+ {
+ SpriteEffects spriteEffect = (dir == Direction.Right) ? SpriteEffects.None : SpriteEffects.FlipHorizontally;
+
+ Vector2 origin = wearable.Sprite.Origin;
+ if (body.Dir == -1.0f) origin.X = wearable.Sprite.SourceRect.Width - origin.X;
+
+ float depth = sprite.Depth - 0.000001f;
+
+ if (wearable.DepthLimb != LimbType.None)
+ {
+ Limb depthLimb = character.AnimController.GetLimb(wearable.DepthLimb);
+ if (depthLimb != null)
+ {
+ depth = depthLimb.sprite.Depth - 0.000001f;
+ }
+ }
+
+ wearable.Sprite.Draw(spriteBatch,
+ new Vector2(body.DrawPosition.X, -body.DrawPosition.Y),
+ color, origin,
+ -body.DrawRotation,
+ scale, spriteEffect, depth);
+ }
+
+ if (damage > 0.0f && damagedSprite != null && !hideLimb)
+ {
+ SpriteEffects spriteEffect = (dir == Direction.Right) ? SpriteEffects.None : SpriteEffects.FlipHorizontally;
+
+ float depth = sprite.Depth - 0.0000015f;
+
+ damagedSprite.Draw(spriteBatch,
+ new Vector2(body.DrawPosition.X, -body.DrawPosition.Y),
+ color * Math.Min(damage / 50.0f, 1.0f), sprite.Origin,
+ -body.DrawRotation,
+ 1.0f, spriteEffect, depth);
+ }
+
+ if (!GameMain.DebugDraw) return;
+
+ if (pullJoint != null)
+ {
+ Vector2 pos = ConvertUnits.ToDisplayUnits(pullJoint.WorldAnchorB);
+ GUI.DrawRectangle(spriteBatch, new Rectangle((int)pos.X, (int)-pos.Y, 5, 5), Color.Red, true);
+ }
+ }
+ }
+}
diff --git a/BarotraumaClient/Source/DebugConsole.cs b/BarotraumaClient/Source/DebugConsole.cs
new file mode 100644
index 000000000..60ff53d55
--- /dev/null
+++ b/BarotraumaClient/Source/DebugConsole.cs
@@ -0,0 +1,496 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+using Microsoft.Xna.Framework.Input;
+using Barotrauma.Networking;
+using Barotrauma.Items.Components;
+using System.Text;
+using FarseerPhysics;
+
+namespace Barotrauma
+{
+ static partial class DebugConsole
+ {
+ static bool isOpen;
+
+ //used for keeping track of the message entered when pressing up/down
+ static int selectedIndex;
+
+ public static bool IsOpen
+ {
+ get
+ {
+ return isOpen;
+ }
+ }
+
+ static GUIFrame frame;
+ static GUIListBox listBox;
+ static GUITextBox textBox;
+
+ private static string InputText
+ {
+ get { return textBox.Text; }
+ set { textBox.Text = value; }
+ }
+
+ public static void Init(GameWindow window)
+ {
+ int x = 20, y = 20;
+ int width = 800, height = 500;
+
+ frame = new GUIFrame(new Rectangle(x, y, width, height), new Color(0.4f, 0.4f, 0.4f, 0.8f));
+ frame.Padding = new Vector4(5.0f, 5.0f, 5.0f, 5.0f);
+
+ listBox = new GUIListBox(new Rectangle(0, 0, 0, frame.Rect.Height - 40), Color.Black, "", frame);
+ //listBox.Color = Color.Black * 0.7f;
+
+ textBox = new GUITextBox(new Rectangle(0, 0, 0, 20), Color.Black, Color.White, Alignment.BottomLeft, Alignment.Left, "", frame);
+ //textBox.Color = Color.Black * 0.7f;
+
+ //messages already added before initialization -> add them to the listbox
+ List unInitializedMessages = new List(Messages);
+ Messages.Clear();
+
+ foreach (ColoredText msg in unInitializedMessages)
+ {
+ NewMessage(msg.Text, msg.Color);
+ }
+
+ NewMessage("Press F3 to open/close the debug console", Color.Cyan);
+ NewMessage("Enter \"help\" for a list of available console commands", Color.Cyan);
+
+ }
+
+ public static void AddToGUIUpdateList()
+ {
+ if (isOpen)
+ {
+ frame.AddToGUIUpdateList();
+ }
+ }
+
+ public static void Update(GameMain game, float deltaTime)
+ {
+ if (PlayerInput.KeyHit(Keys.F3))
+ {
+ isOpen = !isOpen;
+ if (isOpen)
+ {
+ textBox.Select();
+ AddToGUIUpdateList();
+ }
+ else
+ {
+ GUIComponent.ForceMouseOn(null);
+ textBox.Deselect();
+ }
+
+ //keyboardDispatcher.Subscriber = (isOpen) ? textBox : null;
+ }
+
+ if (isOpen)
+ {
+ frame.Update(deltaTime);
+
+ Character.DisableControls = true;
+
+ if (PlayerInput.KeyHit(Keys.Up))
+ {
+ SelectMessage(-1);
+ }
+ else if (PlayerInput.KeyHit(Keys.Down))
+ {
+ SelectMessage(1);
+ }
+
+ //textBox.Update(deltaTime);
+
+ if (PlayerInput.KeyDown(Keys.Enter) && textBox.Text != "")
+ {
+ ExecuteCommand(textBox.Text, game);
+ textBox.Text = "";
+
+ //selectedIndex = messages.Count;
+ }
+ }
+ }
+
+ private static void SelectMessage(int direction)
+ {
+ int messageCount = listBox.children.Count;
+ if (messageCount == 0) return;
+
+ direction = Math.Min(Math.Max(-1, direction), 1);
+
+ selectedIndex += direction;
+ if (selectedIndex < 0) selectedIndex = messageCount - 1;
+ selectedIndex = selectedIndex % messageCount;
+
+ textBox.Text = (listBox.children[selectedIndex] as GUITextBlock).Text;
+ }
+
+ public static void Draw(SpriteBatch spriteBatch)
+ {
+ if (!isOpen) return;
+
+ frame.Draw(spriteBatch);
+ }
+
+ private static bool IsCommandPermitted(string command, GameClient client)
+ {
+ switch (command)
+ {
+ case "kick":
+ return client.HasPermission(ClientPermissions.Kick);
+ case "ban":
+ case "banip":
+ return client.HasPermission(ClientPermissions.Ban);
+ case "netstats":
+ case "help":
+ case "dumpids":
+ case "admin":
+ return true;
+ default:
+ return false;
+ }
+ }
+
+ private static bool ExecProjSpecific(string[] commands)
+ {
+ switch (commands[0].ToLowerInvariant())
+ {
+ case "startclient":
+ if (commands.Length == 1) return true;
+ if (GameMain.Client == null)
+ {
+ GameMain.NetworkMember = new GameClient("Name");
+ GameMain.Client.ConnectToServer(commands[1]);
+ }
+ break;
+ case "mainmenuscreen":
+ case "mainmenu":
+ case "menu":
+ GameMain.GameSession = null;
+
+ List characters = new List(Character.CharacterList);
+ foreach (Character c in characters)
+ {
+ c.Remove();
+ }
+
+ GameMain.MainMenuScreen.Select();
+ break;
+ case "gamescreen":
+ case "game":
+ GameMain.GameScreen.Select();
+ break;
+ case "editmapscreen":
+ case "editmap":
+ case "edit":
+ if (commands.Length > 1)
+ {
+ Submarine.Load(string.Join(" ", commands.Skip(1)), true);
+ }
+ GameMain.EditMapScreen.Select();
+ break;
+ case "editcharacter":
+ case "editchar":
+ GameMain.EditCharacterScreen.Select();
+ break;
+ case "controlcharacter":
+ case "control":
+ {
+ if (commands.Length < 2) break;
+
+ var character = FindMatchingCharacter(commands, true);
+
+ if (character != null)
+ {
+ Character.Controlled = character;
+ }
+ }
+ break;
+ case "setclientcharacter":
+ {
+ if (GameMain.Server == null) break;
+
+ int separatorIndex = Array.IndexOf(commands, ";");
+
+ if (separatorIndex == -1 || commands.Length < 4)
+ {
+ ThrowError("Invalid parameters. The command should be formatted as \"setclientcharacter [client] ; [character]\"");
+ break;
+ }
+
+ string[] commandsLeft = commands.Take(separatorIndex).ToArray();
+ string[] commandsRight = commands.Skip(separatorIndex).ToArray();
+
+ string clientName = String.Join(" ", commandsLeft.Skip(1));
+
+ var client = GameMain.Server.ConnectedClients.Find(c => c.name == clientName);
+ if (client == null)
+ {
+ ThrowError("Client \"" + clientName + "\" not found.");
+ }
+
+ var character = FindMatchingCharacter(commandsRight, false);
+ GameMain.Server.SetClientCharacter(client, character);
+ }
+ break;
+ case "test":
+ Submarine.Load("aegir mark ii", true);
+ GameMain.DebugDraw = true;
+ GameMain.LightManager.LosEnabled = false;
+ GameMain.EditMapScreen.Select();
+ break;
+ case "shake":
+ GameMain.GameScreen.Cam.Shake = 10.0f;
+ break;
+ case "losenabled":
+ case "los":
+ case "drawlos":
+ GameMain.LightManager.LosEnabled = !GameMain.LightManager.LosEnabled;
+ break;
+ case "lighting":
+ case "lightingenabled":
+ case "light":
+ case "lights":
+ GameMain.LightManager.LightingEnabled = !GameMain.LightManager.LightingEnabled;
+ break;
+ case "tutorial":
+ TutorialMode.StartTutorial(Tutorials.TutorialType.TutorialTypes[0]);
+ break;
+ case "editortutorial":
+ GameMain.EditMapScreen.Select();
+ GameMain.EditMapScreen.StartTutorial();
+ break;
+ case "lobbyscreen":
+ case "lobby":
+ GameMain.LobbyScreen.Select();
+ break;
+ case "savemap":
+ case "savesub":
+ case "save":
+ if (commands.Length < 2) break;
+
+ if (GameMain.EditMapScreen.CharacterMode)
+ {
+ GameMain.EditMapScreen.ToggleCharacterMode();
+ }
+
+ string fileName = string.Join(" ", commands.Skip(1));
+ if (fileName.Contains("../"))
+ {
+ DebugConsole.ThrowError("Illegal symbols in filename (../)");
+ return true;
+ }
+
+ if (Submarine.SaveCurrent(System.IO.Path.Combine(Submarine.SavePath, fileName + ".sub")))
+ {
+ NewMessage("Sub saved", Color.Green);
+ //Submarine.Loaded.First().CheckForErrors();
+ }
+
+ break;
+ case "loadmap":
+ case "loadsub":
+ case "load":
+ if (commands.Length < 2) break;
+
+ Submarine.Load(string.Join(" ", commands.Skip(1)), true);
+ break;
+ case "cleansub":
+ for (int i = MapEntity.mapEntityList.Count - 1; i >= 0; i--)
+ {
+ MapEntity me = MapEntity.mapEntityList[i];
+
+ if (me.SimPosition.Length() > 2000.0f)
+ {
+ DebugConsole.NewMessage("Removed " + me.Name + " (simposition " + me.SimPosition + ")", Color.Orange);
+ MapEntity.mapEntityList.RemoveAt(i);
+ }
+ else if (me.MoveWithLevel)
+ {
+ DebugConsole.NewMessage("Removed " + me.Name + " (MoveWithLevel==true)", Color.Orange);
+ MapEntity.mapEntityList.RemoveAt(i);
+ }
+ else if (me is Item)
+ {
+ Item item = me as Item;
+ var wire = item.GetComponent();
+ if (wire == null) continue;
+
+ if (wire.GetNodes().Count > 0 && !wire.Connections.Any(c => c != null))
+ {
+ wire.Item.Drop(null);
+ DebugConsole.NewMessage("Dropped wire (ID: " + wire.Item.ID + ") - attached on wall but no connections found", Color.Orange);
+ }
+ }
+
+ }
+ break;
+ case "messagebox":
+ if (commands.Length < 3) break;
+ new GUIMessageBox(commands[1], commands[2]);
+ break;
+ case "debugdraw":
+ GameMain.DebugDraw = !GameMain.DebugDraw;
+ break;
+ case "disablehud":
+ case "hud":
+ GUI.DisableHUD = !GUI.DisableHUD;
+ GameMain.Instance.IsMouseVisible = !GameMain.Instance.IsMouseVisible;
+ break;
+ case "followsub":
+ Camera.FollowSub = !Camera.FollowSub;
+ break;
+ case "drawaitargets":
+ case "showaitargets":
+ AITarget.ShowAITargets = !AITarget.ShowAITargets;
+ break;
+#if DEBUG
+ case "spamevents":
+ foreach (Item item in Item.ItemList)
+ {
+ for (int i = 0; i();
+ if (itemContainer != null)
+ {
+ GameMain.Server.CreateEntityEvent(item, new object[] { NetEntityEvent.Type.InventoryState });
+ }
+
+ GameMain.Server.CreateEntityEvent(item, new object[] { NetEntityEvent.Type.Status });
+
+ item.NeedsPositionUpdate = true;
+ }
+ }
+
+ foreach (Character c in Character.CharacterList)
+ {
+ GameMain.Server.CreateEntityEvent(c, new object[] { NetEntityEvent.Type.Status });
+ }
+
+ foreach (Structure wall in Structure.WallList)
+ {
+ GameMain.Server.CreateEntityEvent(wall);
+ }
+ break;
+ case "spamchatmessages":
+ int msgCount = 1000;
+ if (commands.Length > 1) int.TryParse(commands[1], out msgCount);
+ int msgLength = 50;
+ if (commands.Length > 2) int.TryParse(commands[2], out msgLength);
+
+ for (int i = 0; i < msgCount; i++)
+ {
+ if (GameMain.Server != null)
+ {
+ GameMain.Server.SendChatMessage(ToolBox.RandomSeed(msgLength), ChatMessageType.Default);
+ }
+ else
+ {
+ GameMain.Client.SendChatMessage(ToolBox.RandomSeed(msgLength));
+ }
+ }
+ break;
+#endif
+ case "cleanbuild":
+ GameMain.Config.MusicVolume = 0.5f;
+ GameMain.Config.SoundVolume = 0.5f;
+ DebugConsole.NewMessage("Music and sound volume set to 0.5", Color.Green);
+
+ GameMain.Config.GraphicsWidth = 0;
+ GameMain.Config.GraphicsHeight = 0;
+ GameMain.Config.WindowMode = WindowMode.Fullscreen;
+ DebugConsole.NewMessage("Resolution set to 0 x 0 (screen resolution will be used)", Color.Green);
+ DebugConsole.NewMessage("Fullscreen enabled", Color.Green);
+
+ GameSettings.VerboseLogging = false;
+
+ if (GameMain.Config.MasterServerUrl != "http://www.undertowgames.com/baromaster")
+ {
+ DebugConsole.ThrowError("MasterServerUrl \"" + GameMain.Config.MasterServerUrl + "\"!");
+ }
+
+ GameMain.Config.Save("config.xml");
+
+ var saveFiles = System.IO.Directory.GetFiles(SaveUtil.SaveFolder);
+
+ foreach (string saveFile in saveFiles)
+ {
+ System.IO.File.Delete(saveFile);
+ DebugConsole.NewMessage("Deleted " + saveFile, Color.Green);
+ }
+
+ if (System.IO.Directory.Exists(System.IO.Path.Combine(SaveUtil.SaveFolder, "temp")))
+ {
+ System.IO.Directory.Delete(System.IO.Path.Combine(SaveUtil.SaveFolder, "temp"), true);
+ DebugConsole.NewMessage("Deleted temp save folder", Color.Green);
+ }
+
+ if (System.IO.Directory.Exists(ServerLog.SavePath))
+ {
+ var logFiles = System.IO.Directory.GetFiles(ServerLog.SavePath);
+
+ foreach (string logFile in logFiles)
+ {
+ System.IO.File.Delete(logFile);
+ DebugConsole.NewMessage("Deleted " + logFile, Color.Green);
+ }
+ }
+
+ if (System.IO.File.Exists("filelist.xml"))
+ {
+ System.IO.File.Delete("filelist.xml");
+ DebugConsole.NewMessage("Deleted filelist", Color.Green);
+ }
+
+
+ if (System.IO.File.Exists("Submarines/TutorialSub.sub"))
+ {
+ System.IO.File.Delete("Submarines/TutorialSub.sub");
+
+ DebugConsole.NewMessage("Deleted TutorialSub from the submarine folder", Color.Green);
+ }
+
+ if (System.IO.File.Exists(GameServer.SettingsFile))
+ {
+ System.IO.File.Delete(GameServer.SettingsFile);
+ DebugConsole.NewMessage("Deleted server settings", Color.Green);
+ }
+
+ if (System.IO.File.Exists(GameServer.ClientPermissionsFile))
+ {
+ System.IO.File.Delete(GameServer.ClientPermissionsFile);
+ DebugConsole.NewMessage("Deleted client permission file", Color.Green);
+
+ }
+
+ if (System.IO.File.Exists("crashreport.txt"))
+ {
+ System.IO.File.Delete("crashreport.txt");
+ DebugConsole.NewMessage("Deleted crashreport.txt", Color.Green);
+ }
+
+ if (!System.IO.File.Exists("Content/Map/TutorialSub.sub"))
+ {
+ DebugConsole.ThrowError("TutorialSub.sub not found!");
+ }
+
+ break;
+ default:
+ return false; //command not found
+ break;
+ }
+ return true; //command found
+ }
+ }
+}
diff --git a/BarotraumaShared/Source/GameSession/CrewManager.cs b/BarotraumaClient/Source/GameSession/CrewManager.cs
similarity index 100%
rename from BarotraumaShared/Source/GameSession/CrewManager.cs
rename to BarotraumaClient/Source/GameSession/CrewManager.cs
diff --git a/BarotraumaShared/Source/GameSession/GameModes/SinglePlayerMode.cs b/BarotraumaClient/Source/GameSession/GameModes/SinglePlayerMode.cs
similarity index 100%
rename from BarotraumaShared/Source/GameSession/GameModes/SinglePlayerMode.cs
rename to BarotraumaClient/Source/GameSession/GameModes/SinglePlayerMode.cs
diff --git a/BarotraumaShared/Source/GameSession/GameModes/Tutorials/BasicTutorial.cs b/BarotraumaClient/Source/GameSession/GameModes/Tutorials/BasicTutorial.cs
similarity index 100%
rename from BarotraumaShared/Source/GameSession/GameModes/Tutorials/BasicTutorial.cs
rename to BarotraumaClient/Source/GameSession/GameModes/Tutorials/BasicTutorial.cs
diff --git a/BarotraumaShared/Source/GameSession/GameModes/Tutorials/EditorTutorial.cs b/BarotraumaClient/Source/GameSession/GameModes/Tutorials/EditorTutorial.cs
similarity index 100%
rename from BarotraumaShared/Source/GameSession/GameModes/Tutorials/EditorTutorial.cs
rename to BarotraumaClient/Source/GameSession/GameModes/Tutorials/EditorTutorial.cs
diff --git a/BarotraumaShared/Source/GameSession/GameModes/Tutorials/TutorialMode.cs b/BarotraumaClient/Source/GameSession/GameModes/Tutorials/TutorialMode.cs
similarity index 100%
rename from BarotraumaShared/Source/GameSession/GameModes/Tutorials/TutorialMode.cs
rename to BarotraumaClient/Source/GameSession/GameModes/Tutorials/TutorialMode.cs
diff --git a/BarotraumaShared/Source/GameSession/GameModes/Tutorials/TutorialType.cs b/BarotraumaClient/Source/GameSession/GameModes/Tutorials/TutorialType.cs
similarity index 100%
rename from BarotraumaShared/Source/GameSession/GameModes/Tutorials/TutorialType.cs
rename to BarotraumaClient/Source/GameSession/GameModes/Tutorials/TutorialType.cs
diff --git a/BarotraumaClient/Source/GameSession/GameSession.cs b/BarotraumaClient/Source/GameSession/GameSession.cs
new file mode 100644
index 000000000..1254f63e8
--- /dev/null
+++ b/BarotraumaClient/Source/GameSession/GameSession.cs
@@ -0,0 +1,197 @@
+using System;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+using System.Xml.Linq;
+
+namespace Barotrauma
+{
+ partial class GameSession
+ {
+ private InfoFrameTab selectedTab;
+ private GUIButton infoButton;
+ private GUIFrame infoFrame;
+
+ public Map Map
+ {
+ get
+ {
+ SinglePlayerMode mode = (gameMode as SinglePlayerMode);
+ return (mode == null) ? null : mode.Map;
+ }
+ }
+
+ private ShiftSummary shiftSummary;
+
+ public ShiftSummary ShiftSummary
+ {
+ get { return shiftSummary; }
+ }
+
+ public bool LoadPrevious(GUIButton button, object obj)
+ {
+ Submarine.Unload();
+
+ SaveUtil.LoadGame(saveFile);
+
+ GameMain.LobbyScreen.Select();
+
+ return true;
+ }
+
+ private bool ToggleInfoFrame(GUIButton button, object obj)
+ {
+ if (infoFrame == null)
+ {
+ if (CrewManager != null && CrewManager.CrewCommander != null && CrewManager.CrewCommander.IsOpen)
+ {
+ CrewManager.CrewCommander.ToggleGUIFrame();
+ }
+
+ CreateInfoFrame();
+ SelectInfoFrameTab(null, selectedTab);
+ }
+ else
+ {
+ infoFrame = null;
+ }
+
+ return true;
+ }
+
+ public void CreateInfoFrame()
+ {
+ int width = 600, height = 400;
+
+
+ infoFrame = new GUIFrame(
+ Rectangle.Empty, Color.Black * 0.8f, null);
+
+ var innerFrame = new GUIFrame(
+ new Rectangle(GameMain.GraphicsWidth / 2 - width / 2, GameMain.GraphicsHeight / 2 - height / 2, width, height), "", infoFrame);
+
+ innerFrame.Padding = new Vector4(10.0f, 10.0f, 10.0f, 10.0f);
+
+ var crewButton = new GUIButton(new Rectangle(0, -30, 100, 20), "Crew", "", innerFrame);
+ crewButton.UserData = InfoFrameTab.Crew;
+ crewButton.OnClicked = SelectInfoFrameTab;
+
+ var missionButton = new GUIButton(new Rectangle(100, -30, 100, 20), "Mission", "", innerFrame);
+ missionButton.UserData = InfoFrameTab.Mission;
+ missionButton.OnClicked = SelectInfoFrameTab;
+
+ if (GameMain.Server != null)
+ {
+ var manageButton = new GUIButton(new Rectangle(200, -30, 130, 20), "Manage players", "", innerFrame);
+ manageButton.UserData = InfoFrameTab.ManagePlayers;
+ manageButton.OnClicked = SelectInfoFrameTab;
+ }
+
+ var closeButton = new GUIButton(new Rectangle(0, 0, 80, 20), "Close", Alignment.BottomCenter, "", innerFrame);
+ closeButton.OnClicked = ToggleInfoFrame;
+
+ }
+
+ private bool SelectInfoFrameTab(GUIButton button, object userData)
+ {
+ selectedTab = (InfoFrameTab)userData;
+
+ CreateInfoFrame();
+
+ switch (selectedTab)
+ {
+ case InfoFrameTab.Crew:
+ CrewManager.CreateCrewFrame(CrewManager.characters, infoFrame.children[0] as GUIFrame);
+ break;
+ case InfoFrameTab.Mission:
+ CreateMissionInfo(infoFrame.children[0] as GUIFrame);
+ break;
+ case InfoFrameTab.ManagePlayers:
+ GameMain.Server.ManagePlayersFrame(infoFrame.children[0] as GUIFrame);
+ break;
+ }
+
+ return true;
+ }
+
+ private void CreateMissionInfo(GUIFrame infoFrame)
+ {
+ if (Mission == null)
+ {
+ new GUITextBlock(new Rectangle(0, 0, 0, 50), "No mission", "", infoFrame, true);
+ return;
+ }
+
+ new GUITextBlock(new Rectangle(0, 0, 0, 40), Mission.Name, "", infoFrame, GUI.LargeFont);
+
+ new GUITextBlock(new Rectangle(0, 50, 0, 20), "Reward: " + Mission.Reward, "", infoFrame, true);
+ new GUITextBlock(new Rectangle(0, 70, 0, 50), Mission.Description, "", infoFrame, true);
+
+
+ }
+
+ public void AddToGUIUpdateList()
+ {
+ infoButton.AddToGUIUpdateList();
+
+ if (gameMode != null) gameMode.AddToGUIUpdateList();
+
+ if (infoFrame != null) infoFrame.AddToGUIUpdateList();
+ }
+
+ public void Update(float deltaTime)
+ {
+ TaskManager.Update(deltaTime);
+
+ if (GUI.DisableHUD) return;
+
+ //guiRoot.Update(deltaTime);
+ infoButton.Update(deltaTime);
+
+ if (gameMode != null) gameMode.Update(deltaTime);
+ if (Mission != null) Mission.Update(deltaTime);
+ if (infoFrame != null)
+ {
+ infoFrame.Update(deltaTime);
+
+ if (CrewManager != null && CrewManager.CrewCommander != null && CrewManager.CrewCommander.IsOpen)
+ {
+ infoFrame = null;
+ }
+ }
+ }
+
+ public void Draw(SpriteBatch spriteBatch)
+ {
+ if (GUI.DisableHUD) return;
+
+ infoButton.Draw(spriteBatch);
+
+ if (gameMode != null) gameMode.Draw(spriteBatch);
+ if (infoFrame != null) infoFrame.Draw(spriteBatch);
+ }
+
+ public void Save(string filePath)
+ {
+ XDocument doc = new XDocument(
+ new XElement("Gamesession"));
+
+ var now = DateTime.Now;
+ doc.Root.Add(new XAttribute("savetime", now.ToShortTimeString() + ", " + now.ToShortDateString()));
+
+ doc.Root.Add(new XAttribute("submarine", submarine == null ? "" : submarine.Name));
+
+ doc.Root.Add(new XAttribute("mapseed", Map.Seed));
+
+ ((SinglePlayerMode)gameMode).Save(doc.Root);
+
+ try
+ {
+ doc.Save(filePath);
+ }
+ catch
+ {
+ DebugConsole.ThrowError("Saving gamesession to \"" + filePath + "\" failed!");
+ }
+ }
+ }
+}
diff --git a/BarotraumaShared/Source/GameSession/ShiftSummary.cs b/BarotraumaClient/Source/GameSession/ShiftSummary.cs
similarity index 100%
rename from BarotraumaShared/Source/GameSession/ShiftSummary.cs
rename to BarotraumaClient/Source/GameSession/ShiftSummary.cs
diff --git a/BarotraumaClient/Source/GameSettings.cs b/BarotraumaClient/Source/GameSettings.cs
new file mode 100644
index 000000000..3d6ff6597
--- /dev/null
+++ b/BarotraumaClient/Source/GameSettings.cs
@@ -0,0 +1,479 @@
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+using Microsoft.Xna.Framework.Input;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Xml.Linq;
+
+namespace Barotrauma
+{
+ public enum WindowMode
+ {
+ Windowed, Fullscreen, BorderlessWindowed
+ }
+
+ public partial class GameSettings
+ {
+ private GUIFrame settingsFrame;
+ private GUIButton applyButton;
+
+ public GUIFrame SettingsFrame
+ {
+ get
+ {
+ if (settingsFrame == null) CreateSettingsFrame();
+ return settingsFrame;
+ }
+ }
+
+ private float soundVolume, musicVolume;
+
+ private WindowMode windowMode;
+
+ private KeyOrMouse[] keyMapping;
+
+ public KeyOrMouse KeyBind(InputType inputType)
+ {
+ return keyMapping[(int)inputType];
+ }
+
+ public int GraphicsWidth { get; set; }
+ public int GraphicsHeight { get; set; }
+
+ public bool VSyncEnabled { get; set; }
+
+ public bool EnableSplashScreen { get; set; }
+
+ //public bool FullScreenEnabled { get; set; }
+
+ public WindowMode WindowMode
+ {
+ get { return windowMode; }
+ set { windowMode = value; }
+ }
+
+ private bool unsavedSettings;
+
+ public bool UnsavedSettings
+ {
+ get
+ {
+ return unsavedSettings;
+ }
+ private set
+ {
+ unsavedSettings = value;
+ if (applyButton != null)
+ {
+ //applyButton.Selected = unsavedSettings;
+ applyButton.Enabled = unsavedSettings;
+ applyButton.Text = unsavedSettings ? "Apply*" : "Apply";
+ }
+ }
+ }
+
+ public float SoundVolume
+ {
+ get { return soundVolume; }
+ set
+ {
+ soundVolume = MathHelper.Clamp(value, 0.0f, 1.0f);
+ Sounds.SoundManager.MasterVolume = soundVolume;
+ }
+ }
+
+ public float MusicVolume
+ {
+ get { return musicVolume; }
+ set
+ {
+ musicVolume = MathHelper.Clamp(value, 0.0f, 1.0f);
+ SoundPlayer.MusicVolume = musicVolume;
+ }
+ }
+
+ private void InitProjSpecific(XDocument doc)
+ {
+ if (doc == null)
+ {
+ GraphicsWidth = 1024;
+ GraphicsHeight = 678;
+
+ return;
+ }
+
+ XElement graphicsMode = doc.Root.Element("graphicsmode");
+ GraphicsWidth = ToolBox.GetAttributeInt(graphicsMode, "width", 0);
+ GraphicsHeight = ToolBox.GetAttributeInt(graphicsMode, "height", 0);
+ VSyncEnabled = ToolBox.GetAttributeBool(graphicsMode, "vsync", true);
+
+ if (GraphicsWidth == 0 || GraphicsHeight == 0)
+ {
+ GraphicsWidth = GraphicsAdapter.DefaultAdapter.CurrentDisplayMode.Width;
+ GraphicsHeight = GraphicsAdapter.DefaultAdapter.CurrentDisplayMode.Height;
+ }
+
+ //FullScreenEnabled = ToolBox.GetAttributeBool(graphicsMode, "fullscreen", true);
+
+ var windowModeStr = ToolBox.GetAttributeString(graphicsMode, "displaymode", "Fullscreen");
+ if (!Enum.TryParse(windowModeStr, out windowMode))
+ {
+ windowMode = WindowMode.Fullscreen;
+ }
+
+ SoundVolume = ToolBox.GetAttributeFloat(doc.Root, "soundvolume", 1.0f);
+ MusicVolume = ToolBox.GetAttributeFloat(doc.Root, "musicvolume", 0.3f);
+
+ EnableSplashScreen = ToolBox.GetAttributeBool(doc.Root, "enablesplashscreen", true);
+
+ keyMapping = new KeyOrMouse[Enum.GetNames(typeof(InputType)).Length];
+ keyMapping[(int)InputType.Up] = new KeyOrMouse(Keys.W);
+ keyMapping[(int)InputType.Down] = new KeyOrMouse(Keys.S);
+ keyMapping[(int)InputType.Left] = new KeyOrMouse(Keys.A);
+ keyMapping[(int)InputType.Right] = new KeyOrMouse(Keys.D);
+ keyMapping[(int)InputType.Run] = new KeyOrMouse(Keys.LeftShift);
+
+
+ keyMapping[(int)InputType.Chat] = new KeyOrMouse(Keys.Tab);
+ keyMapping[(int)InputType.CrewOrders] = new KeyOrMouse(Keys.C);
+
+ keyMapping[(int)InputType.Select] = new KeyOrMouse(Keys.E);
+
+ keyMapping[(int)InputType.Use] = new KeyOrMouse(0);
+ keyMapping[(int)InputType.Aim] = new KeyOrMouse(1);
+
+ foreach (XElement subElement in doc.Root.Elements())
+ {
+ switch (subElement.Name.ToString().ToLowerInvariant())
+ {
+ case "keymapping":
+ foreach (XAttribute attribute in subElement.Attributes())
+ {
+ InputType inputType;
+ if (Enum.TryParse(attribute.Name.ToString(), true, out inputType))
+ {
+ int mouseButton;
+ if (int.TryParse(attribute.Value.ToString(), out mouseButton))
+ {
+ keyMapping[(int)inputType] = new KeyOrMouse(mouseButton);
+ }
+ else
+ {
+ Keys key;
+ if (Enum.TryParse(attribute.Value.ToString(), true, out key))
+ {
+ keyMapping[(int)inputType] = new KeyOrMouse(key);
+ }
+ }
+ }
+ }
+ break;
+ }
+ }
+
+ foreach (InputType inputType in Enum.GetValues(typeof(InputType)))
+ {
+ if (keyMapping[(int)inputType] == null)
+ {
+ DebugConsole.ThrowError("Key binding for the input type \"" + inputType + " not set!");
+ keyMapping[(int)inputType] = new KeyOrMouse(Keys.D1);
+ }
+ }
+
+
+ UnsavedSettings = false;
+ }
+
+ public void Save(string filePath)
+ {
+ UnsavedSettings = false;
+
+ XDocument doc = new XDocument();
+
+ if (doc.Root == null)
+ {
+ doc.Add(new XElement("config"));
+ }
+
+ doc.Root.Add(
+ new XAttribute("masterserverurl", MasterServerUrl),
+ new XAttribute("autocheckupdates", AutoCheckUpdates),
+ new XAttribute("musicvolume", musicVolume),
+ new XAttribute("soundvolume", soundVolume),
+ new XAttribute("verboselogging", VerboseLogging),
+ new XAttribute("enablesplashscreen", EnableSplashScreen));
+
+ if (WasGameUpdated)
+ {
+ doc.Root.Add(new XAttribute("wasgameupdated", true));
+ }
+
+ XElement gMode = doc.Root.Element("graphicsmode");
+ if (gMode == null)
+ {
+ gMode = new XElement("graphicsmode");
+ doc.Root.Add(gMode);
+ }
+
+ if (GraphicsWidth == 0 || GraphicsHeight == 0)
+ {
+ gMode.ReplaceAttributes(new XAttribute("displaymode", windowMode));
+ }
+ else
+ {
+ gMode.ReplaceAttributes(
+ new XAttribute("width", GraphicsWidth),
+ new XAttribute("height", GraphicsHeight),
+ new XAttribute("vsync", VSyncEnabled),
+ new XAttribute("displaymode", windowMode));
+ }
+
+
+ if (SelectedContentPackage != null)
+ {
+ doc.Root.Add(new XElement("contentpackage",
+ new XAttribute("path", SelectedContentPackage.Path)));
+ }
+
+ var keyMappingElement = new XElement("keymapping");
+ doc.Root.Add(keyMappingElement);
+ for (int i = 0; i < keyMapping.Length; i++)
+ {
+ if (keyMapping[i].MouseButton == null)
+ {
+ keyMappingElement.Add(new XAttribute(((InputType)i).ToString(), keyMapping[i].Key));
+ }
+ else
+ {
+ keyMappingElement.Add(new XAttribute(((InputType)i).ToString(), keyMapping[i].MouseButton));
+ }
+
+
+ }
+
+ doc.Save(filePath);
+ }
+
+ private bool ChangeSoundVolume(GUIScrollBar scrollBar, float barScroll)
+ {
+ UnsavedSettings = true;
+ SoundVolume = barScroll;
+
+ return true;
+ }
+
+ private bool ChangeMusicVolume(GUIScrollBar scrollBar, float barScroll)
+ {
+ UnsavedSettings = true;
+ MusicVolume = barScroll;
+
+ return true;
+ }
+
+ public void ResetSettingsFrame()
+ {
+ settingsFrame = null;
+ }
+
+ private void CreateSettingsFrame()
+ {
+ settingsFrame = new GUIFrame(new Rectangle(0, 0, 500, 500), null, Alignment.Center, "");
+
+ new GUITextBlock(new Rectangle(0, -30, 0, 30), "Settings", "", Alignment.TopCenter, Alignment.TopCenter, settingsFrame, false, GUI.LargeFont);
+
+ int x = 0, y = 10;
+
+ new GUITextBlock(new Rectangle(0, y, 20, 20), "Resolution", "", Alignment.TopLeft, Alignment.TopLeft, settingsFrame);
+ var resolutionDD = new GUIDropDown(new Rectangle(0, y + 20, 180, 20), "", "", settingsFrame);
+ resolutionDD.OnSelected = SelectResolution;
+
+ var supportedModes = new List();
+ foreach (DisplayMode mode in GraphicsAdapter.DefaultAdapter.SupportedDisplayModes)
+ {
+ if (supportedModes.FirstOrDefault(m => m.Width == mode.Width && m.Height == mode.Height) != null) continue;
+
+ resolutionDD.AddItem(mode.Width + "x" + mode.Height, mode);
+ supportedModes.Add(mode);
+
+ if (GraphicsWidth == mode.Width && GraphicsHeight == mode.Height) resolutionDD.SelectItem(mode);
+ }
+
+ if (resolutionDD.SelectedItemData == null)
+ {
+ resolutionDD.SelectItem(GraphicsAdapter.DefaultAdapter.SupportedDisplayModes.Last());
+ }
+
+ y += 50;
+
+ //var fullScreenTick = new GUITickBox(new Rectangle(x, y, 20, 20), "Fullscreen", Alignment.TopLeft, settingsFrame);
+ //fullScreenTick.OnSelected = ToggleFullScreen;
+ //fullScreenTick.Selected = FullScreenEnabled;
+
+ new GUITextBlock(new Rectangle(x, y, 20, 20), "Display mode", "", Alignment.TopLeft, Alignment.TopLeft, settingsFrame);
+ var displayModeDD = new GUIDropDown(new Rectangle(x, y + 20, 180, 20), "", "", settingsFrame);
+ displayModeDD.AddItem("Fullscreen", WindowMode.Fullscreen);
+ displayModeDD.AddItem("Windowed", WindowMode.Windowed);
+ displayModeDD.AddItem("Borderless windowed", WindowMode.BorderlessWindowed);
+
+ displayModeDD.SelectItem(GameMain.Config.WindowMode);
+
+ displayModeDD.OnSelected = (guiComponent, obj) => { GameMain.Config.WindowMode = (WindowMode)guiComponent.UserData; return true; };
+
+ y += 70;
+
+ GUITickBox vsyncTickBox = new GUITickBox(new Rectangle(0, y, 20, 20), "Enable vertical sync", Alignment.CenterY | Alignment.Left, settingsFrame);
+ vsyncTickBox.OnSelected = (GUITickBox box) =>
+ {
+ VSyncEnabled = !VSyncEnabled;
+ GameMain.GraphicsDeviceManager.SynchronizeWithVerticalRetrace = VSyncEnabled;
+ GameMain.GraphicsDeviceManager.ApplyChanges();
+ UnsavedSettings = true;
+
+ return true;
+ };
+ vsyncTickBox.Selected = VSyncEnabled;
+
+ y += 70;
+
+ new GUITextBlock(new Rectangle(0, y, 100, 20), "Sound volume:", "", settingsFrame);
+ GUIScrollBar soundScrollBar = new GUIScrollBar(new Rectangle(0, y + 20, 150, 20), "", 0.1f, settingsFrame);
+ soundScrollBar.BarScroll = SoundVolume;
+ soundScrollBar.OnMoved = ChangeSoundVolume;
+ soundScrollBar.Step = 0.05f;
+
+ new GUITextBlock(new Rectangle(0, y + 40, 100, 20), "Music volume:", "", settingsFrame);
+ GUIScrollBar musicScrollBar = new GUIScrollBar(new Rectangle(0, y + 60, 150, 20), "", 0.1f, settingsFrame);
+ musicScrollBar.BarScroll = MusicVolume;
+ musicScrollBar.OnMoved = ChangeMusicVolume;
+ musicScrollBar.Step = 0.05f;
+
+ x = 200;
+ y = 10;
+
+ new GUITextBlock(new Rectangle(x, y, 20, 20), "Content package", "", Alignment.TopLeft, Alignment.TopLeft, settingsFrame);
+ var contentPackageDD = new GUIDropDown(new Rectangle(x, y + 20, 200, 20), "", "", settingsFrame);
+
+ foreach (ContentPackage contentPackage in ContentPackage.list)
+ {
+ contentPackageDD.AddItem(contentPackage.Name, contentPackage);
+
+ if (SelectedContentPackage == contentPackage) contentPackageDD.SelectItem(contentPackage);
+ }
+
+ y += 50;
+ new GUITextBlock(new Rectangle(x, y, 100, 20), "Controls:", "", settingsFrame);
+ y += 30;
+ var inputNames = Enum.GetNames(typeof(InputType));
+ for (int i = 0; i < inputNames.Length; i++)
+ {
+ new GUITextBlock(new Rectangle(x, y, 100, 18), inputNames[i] + ": ", "", Alignment.TopLeft, Alignment.CenterLeft, settingsFrame);
+ var keyBox = new GUITextBox(new Rectangle(x + 100, y, 120, 18), null, null, Alignment.TopLeft, Alignment.CenterLeft, "", settingsFrame);
+
+ keyBox.Text = keyMapping[i].ToString();
+ keyBox.UserData = i;
+ keyBox.OnSelected += KeyBoxSelected;
+ keyBox.SelectedColor = Color.Gold * 0.3f;
+
+ y += 20;
+ }
+
+ applyButton = new GUIButton(new Rectangle(0, 0, 100, 20), "Apply", Alignment.BottomRight, "", settingsFrame);
+ applyButton.OnClicked = ApplyClicked;
+ }
+
+ private void KeyBoxSelected(GUITextBox textBox, Keys key)
+ {
+ textBox.Text = "";
+ CoroutineManager.StartCoroutine(WaitForKeyPress(textBox));
+ }
+
+ private bool MarkUnappliedChanges(GUIButton button, object obj)
+ {
+ UnsavedSettings = true;
+
+ return true;
+ }
+
+ private bool SelectResolution(GUIComponent selected, object userData)
+ {
+ DisplayMode mode = selected.UserData as DisplayMode;
+ if (mode == null) return false;
+
+ if (GraphicsWidth == mode.Width && GraphicsHeight == mode.Height) return false;
+
+ GraphicsWidth = mode.Width;
+ GraphicsHeight = mode.Height;
+
+
+ //GameMain.Graphics.PreferredBackBufferWidth = GraphicsWidth;
+ //GameMain.Graphics.PreferredBackBufferHeight = GraphicsHeight;
+ //GameMain.Graphics.ApplyChanges();
+
+ //CoroutineManager.StartCoroutine(GameMain.Instance.Load());
+
+ UnsavedSettings = true;
+
+ return true;
+ }
+
+
+
+ private IEnumerable