Added commands to change sub, shuttle, gamemode & mission

Also fixed the exe icons
2017-06-22 21:42:09 -03:00
parent be2074b4f0
commit ad1935fdcf
8 changed files with 152 additions and 27 deletions
@@ -11,11 +11,48 @@ namespace Barotrauma
 {
    partial class NetLobbyScreen : Screen
    {
-        public Submarine SelectedSub;
-        public Submarine SelectedShuttle;
+        private Submarine selectedSub;
+        private Submarine selectedShuttle;
+
+        public Submarine SelectedSub
+        {
+            get { return selectedSub; }
+            set { selectedSub = value; lastUpdateID++; }
+        }
+        public Submarine SelectedShuttle
+        {
+            get { return selectedShuttle; }
+            set { selectedShuttle = value; lastUpdateID++; }
+        }

        private GameModePreset[] GameModes;
-        public int SelectedModeIndex;
+
+        private int selectedModeIndex;
+        public int SelectedModeIndex
+        {
+            get { return selectedModeIndex; }
+            set {
+                lastUpdateID++;
+                selectedModeIndex = Math.Max(0, Math.Min(GameModes.Count()-1, value));
+            }
+        }
+
+        public string SelectedModeName
+        {
+            get { return GameModes[SelectedModeIndex].Name; }
+            set
+            {
+                for (int i = 0; i < GameModes.Count(); i++)
+                {
+                    if (GameModes[i].Name.ToLower() == value.ToLower())
+                    {
+                        SelectedModeIndex = i;
+                        break;
+                    }
+                }
+            }
+        }
+
        public GameModePreset SelectedMode
        {
            get { return GameModes[SelectedModeIndex]; }
@@ -23,7 +60,41 @@ namespace Barotrauma

        public string ServerMessageText;

-        public int MissionTypeIndex;
+        private int missionTypeIndex;
+        public int MissionTypeIndex
+        {
+            get { return missionTypeIndex; }
+            set {
+                lastUpdateID++;
+                missionTypeIndex = Math.Max(0, Math.Min(Mission.MissionTypes.Count()-1, value));
+            }
+        }
+
+        public string MissionTypeName
+        {
+            get { return Mission.MissionTypes[MissionTypeIndex]; }
+            set
+            {
+                for (int i = 0; i < Mission.MissionTypes.Count(); i++)
+                {
+                    if (Mission.MissionTypes[i].ToLower() == value.ToLower())
+                    {
+                        MissionTypeIndex = i;
+                        break;
+                    }
+                }
+            }
+        }
+        
+        public void ChangeServerName(string n)
+        {
+            ServerName = n; lastUpdateID++;
+        }
+
+        public void ChangeServerMessage(string m)
+        {
+            ServerMessageText = m; lastUpdateID++;
+        }

        public List<JobPrefab> JobPreferences
        {
@@ -39,8 +110,13 @@ namespace Barotrauma

            subs = Submarine.SavedSubmarines.Where(s => !s.HasTag(SubmarineTag.HideInMenus)).ToList();

-            SelectedSub = subs[0];
-            SelectedShuttle = subs[0]; //TODO: don't use the same sub as a shuttle by default
+            if (subs == null || subs.Count()==0)
+            {
+                throw new Exception("No submarines are available.");
+            }
+
+            selectedSub = subs.First(s => !s.HasTag(SubmarineTag.Shuttle));
+            selectedShuttle = subs.First(s => s.HasTag(SubmarineTag.Shuttle));

            DebugConsole.NewMessage("Selected sub: " + SelectedSub.Name, Color.White);
            DebugConsole.NewMessage("Selected shuttle: " + SelectedShuttle.Name, Color.White);