vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Syncing campaign state & save files with clients (WIP)

Browse Source
This commit is contained in:
Joonas Rikkonen
2017-09-11 21:32:48 +03:00
parent 51cfef214c
commit 63bca3c7ea
13 changed files with 383 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/GameSession/GameModes/MultiplayerCampaign.cs
+175 -51
View File
@@ -1,14 +1,34 @@
using Microsoft.Xna.Framework;
using Barotrauma.Networking;
using Microsoft.Xna.Framework;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Xml.Linq;
using Lidgren.Network;
using System.Collections.Generic;
namespace Barotrauma
{
class MultiplayerCampaign : CampaignMode
{
private UInt16 lastUpdateID;
public UInt16 LastUpdateID
{
get { if (GameMain.Server != null && lastUpdateID < 1) lastUpdateID++; return lastUpdateID; }
set { lastUpdateID = value; }
}
private UInt16 lastSaveID;
public UInt16 LastSaveID
{
get { if (GameMain.Server != null && lastSaveID < 1) lastSaveID++; return lastSaveID; }
set { lastSaveID = value; }
}
public UInt16 PendingSaveID
{
get;
set;
}
public MultiplayerCampaign(GameModePreset preset, object param) :
base(preset, param)
@@ -49,88 +69,123 @@ namespace Barotrauma
GameMain.GameSession = new GameSession(sub, saveName, GameModePreset.list.Find(g => g.Name == "Campaign"));
var campaign = ((MultiplayerCampaign)GameMain.GameSession.GameMode);
campaign.GenerateMap(mapSeed);
campaign.map.OnLocationSelected += (loc, connection) => { campaign.LastUpdateID++; };
setupBox.Close();
GameMain.NetLobbyScreen.ToggleCampaignMode(true);
SaveUtil.SaveGame(GameMain.GameSession.SavePath);
campaign.LastSaveID++;
};
campaignSetupUI.LoadGame = (string fileName) =>
{
SaveUtil.LoadGame(fileName);
var campaign = ((MultiplayerCampaign)GameMain.GameSession.GameMode);
campaign.LastSaveID++;
setupBox.Close();
GameMain.NetLobbyScreen.ToggleCampaignMode(true);
};
var cancelButton = new GUIButton(new Rectangle(0,0,120,30), "Cancel", Alignment.BottomLeft, "", setupBox.InnerFrame);
cancelButton.OnClicked += (btn, obj) =>
{
setupBox.Close();
int otherModeIndex = 0;
for (otherModeIndex = 0; otherModeIndex < GameMain.NetLobbyScreen.ModeList.children.Count; otherModeIndex++)
{
if (GameMain.NetLobbyScreen.ModeList.children[otherModeIndex].UserData is MultiplayerCampaign) continue;
break;
}
GameMain.NetLobbyScreen.SelectMode(otherModeIndex);
return true;
};
}
#endif
public override void Start()
{
base.Start();
lastUpdateID++;
}
public override void End(string endMessage = "")
{
isRunning = false;
bool success =
GameMain.Server.ConnectedClients.Any(c => c.inGame && c.Character != null && !c.Character.IsDead) ||
(GameMain.Server.Character != null && !GameMain.Server.Character.IsDead);
/*if (success)
if (GameMain.Server != null)
{
if (subsToLeaveBehind == null || leavingSub == null)
lastUpdateID++;
bool success =
GameMain.Server.ConnectedClients.Any(c => c.inGame && c.Character != null && !c.Character.IsDead) ||
(GameMain.Server.Character != null && !GameMain.Server.Character.IsDead);
/*if (success)
{
DebugConsole.ThrowError("Leaving submarine not selected -> selecting the closest one");
leavingSub = GetLeavingSub();
subsToLeaveBehind = GetSubsToLeaveBehind(leavingSub);
}
}*/
GameMain.GameSession.EndRound("");
if (success)
{
bool atEndPosition = Submarine.MainSub.AtEndPosition;
/*if (leavingSub != Submarine.MainSub && !leavingSub.DockedTo.Contains(Submarine.MainSub))
{
Submarine.MainSub = leavingSub;
GameMain.GameSession.Submarine = leavingSub;
foreach (Submarine sub in subsToLeaveBehind)
if (subsToLeaveBehind == null || leavingSub == null)
{
MapEntity.mapEntityList.RemoveAll(e => e.Submarine == sub && e is LinkedSubmarine);
LinkedSubmarine.CreateDummy(leavingSub, sub);
DebugConsole.ThrowError("Leaving submarine not selected -> selecting the closest one");
leavingSub = GetLeavingSub();
subsToLeaveBehind = GetSubsToLeaveBehind(leavingSub);
}
}*/
if (atEndPosition)
GameMain.GameSession.EndRound("");
if (success)
{
Map.MoveToNextLocation();
bool atEndPosition = Submarine.MainSub.AtEndPosition;
/*if (leavingSub != Submarine.MainSub && !leavingSub.DockedTo.Contains(Submarine.MainSub))
{
Submarine.MainSub = leavingSub;
GameMain.GameSession.Submarine = leavingSub;
foreach (Submarine sub in subsToLeaveBehind)
{
MapEntity.mapEntityList.RemoveAll(e => e.Submarine == sub && e is LinkedSubmarine);
LinkedSubmarine.CreateDummy(leavingSub, sub);
}
}*/
if (atEndPosition)
{
Map.MoveToNextLocation();
}
SaveUtil.SaveGame(GameMain.GameSession.SavePath);
}
SaveUtil.SaveGame(GameMain.GameSession.SavePath);
}
if (!success)
{
/* var summaryScreen = GUIMessageBox.VisibleBox;
if (summaryScreen != null)
if (!success)
{
summaryScreen = summaryScreen.children[0];
summaryScreen.RemoveChild(summaryScreen.children.Find(c => c is GUIButton));
/* var summaryScreen = GUIMessageBox.VisibleBox;
var okButton = new GUIButton(new Rectangle(-120, 0, 100, 30), "Load game", Alignment.BottomRight, "", summaryScreen);
okButton.OnClicked += GameMain.GameSession.LoadPrevious;
okButton.OnClicked += (GUIButton button, object obj) => { GUIMessageBox.MessageBoxes.Remove(GUIMessageBox.VisibleBox); return true; };
if (summaryScreen != null)
{
summaryScreen = summaryScreen.children[0];
summaryScreen.RemoveChild(summaryScreen.children.Find(c => c is GUIButton));
var quitButton = new GUIButton(new Rectangle(0, 0, 100, 30), "Quit", Alignment.BottomRight, "", summaryScreen);
quitButton.OnClicked += GameMain.LobbyScreen.QuitToMainMenu;
quitButton.OnClicked += (GUIButton button, object obj) => { GUIMessageBox.MessageBoxes.Remove(GUIMessageBox.VisibleBox); return true; };
}*/
var okButton = new GUIButton(new Rectangle(-120, 0, 100, 30), "Load game", Alignment.BottomRight, "", summaryScreen);
okButton.OnClicked += GameMain.GameSession.LoadPrevious;
okButton.OnClicked += (GUIButton button, object obj) => { GUIMessageBox.MessageBoxes.Remove(GUIMessageBox.VisibleBox); return true; };
var quitButton = new GUIButton(new Rectangle(0, 0, 100, 30), "Quit", Alignment.BottomRight, "", summaryScreen);
quitButton.OnClicked += GameMain.LobbyScreen.QuitToMainMenu;
quitButton.OnClicked += (GUIButton button, object obj) => { GUIMessageBox.MessageBoxes.Remove(GUIMessageBox.VisibleBox); return true; };
}*/
}
}
for (int i = Character.CharacterList.Count - 1; i >= 0; i--)
@@ -165,6 +220,8 @@ namespace Barotrauma
campaign.map.SetLocation(ToolBox.GetAttributeInt(element, "currentlocation", 0));
}
campaign.map.OnLocationSelected += (loc, connection) => { campaign.LastUpdateID++; };
//campaign.savedOnStart = true;
return campaign;
}
@@ -175,6 +232,73 @@ namespace Barotrauma
modeElement.Add(new XAttribute("money", Money));
Map.Save(modeElement);
element.Add(modeElement);
lastSaveID++;
}
public void ServerWrite(NetBuffer msg, Client c)
{
System.Diagnostics.Debug.Assert(map.Locations.Count < UInt16.MaxValue);
msg.Write(lastUpdateID);
msg.Write(lastSaveID);
msg.Write(map.Seed);
msg.Write(map.CurrentLocationIndex == -1 ? UInt16.MaxValue : (UInt16)map.CurrentLocationIndex);
msg.Write(map.SelectedLocationIndex == -1 ? UInt16.MaxValue : (UInt16)map.SelectedLocationIndex);
}
#if CLIENT
public static void ClientRead(NetBuffer msg)
{
//static because we may need to instantiate the campaign if it hasn't been done yet
UInt16 updateID = msg.ReadUInt16();
UInt16 saveID = msg.ReadUInt16();
string mapSeed = msg.ReadString();
UInt16 currentLocIndex = msg.ReadUInt16();
UInt16 selectedLocIndex = msg.ReadUInt16();
MultiplayerCampaign campaign = GameMain.GameSession?.GameMode as MultiplayerCampaign;
if (campaign == null)
{
string savePath = SaveUtil.CreateSavePath(SaveUtil.SaveType.Multiplayer);
GameMain.GameSession = new GameSession(
null, //TODO: set the sub (after receiving the save file?)
savePath, GameModePreset.list.Find(g => g.Name == "Campaign"));
campaign = ((MultiplayerCampaign)GameMain.GameSession.GameMode);
campaign.GenerateMap(mapSeed);
GameMain.NetLobbyScreen.ToggleCampaignMode(true);
}
if (NetIdUtils.IdMoreRecent(campaign.lastUpdateID, updateID)) return;
//server has a newer save file
if (NetIdUtils.IdMoreRecent(saveID, campaign.PendingSaveID))
{
//stop any active campaign save transfers, they're outdated now
List<FileReceiver.FileTransferIn> saveTransfers =
GameMain.Client.FileReceiver.ActiveTransfers.FindAll(t => t.FileType == FileTransferType.CampaignSave);
foreach (var transfer in saveTransfers)
{
GameMain.Client.FileReceiver.StopTransfer(transfer);
}
GameMain.Client.RequestFile(FileTransferType.CampaignSave, null, null);
campaign.PendingSaveID = saveID;
}
//we've got the latest save file
else if (!NetIdUtils.IdMoreRecent(saveID, campaign.lastSaveID))
{
campaign.Map.SetLocation(currentLocIndex == UInt16.MaxValue ? -1 : currentLocIndex);
campaign.Map.SelectLocation(selectedLocIndex == UInt16.MaxValue ? -1 : selectedLocIndex);
campaign.lastUpdateID = updateID;
}
}
#endif
}
}
Barotrauma/BarotraumaShared/Source/GameSession/GameSession.cs
+2 -1
View File
@@ -79,6 +79,7 @@ namespace Barotrauma
public string SavePath
{
get { return savePath; }
set { savePath = value; }
}
public GameSession(Submarine submarine, string savePath, GameModePreset gameModePreset = null, string missionType = "")
@@ -168,7 +169,7 @@ namespace Barotrauma
this.level = level;
if (submarine==null)
if (submarine == null)
{
DebugConsole.ThrowError("Couldn't start game session, submarine not selected");
return;
Barotrauma/BarotraumaShared/Source/Map/Map/Map.cs
+40
View File
@@ -28,6 +28,8 @@ namespace Barotrauma
private LocationConnection selectedConnection;
public Action<Location, LocationConnection> OnLocationSelected;
public Location CurrentLocation
{
get { return currentLocation; }
@@ -43,6 +45,11 @@ namespace Barotrauma
get { return selectedLocation; }
}
public int SelectedLocationIndex
{
get { return locations.IndexOf(selectedLocation); }
}
public LocationConnection SelectedConnection
{
get { return selectedConnection; }
@@ -53,6 +60,11 @@ namespace Barotrauma
get { return seed; }
}
public List<Location> Locations
{
get { return locations; }
}
public static Map Load(XElement element)
{
string mapSeed = ToolBox.GetAttributeString(element, "seed", "a");
@@ -342,6 +354,12 @@ namespace Barotrauma
public void SetLocation(int index)
{
if (index == -1)
{
currentLocation = null;
return;
}
if (index < 0 || index >= locations.Count)
{
DebugConsole.ThrowError("Location index out of bounds");
@@ -352,6 +370,28 @@ namespace Barotrauma
currentLocation.Discovered = true;
}
public void SelectLocation(int index)
{
if (index == -1)
{
selectedLocation = null;
selectedConnection = null;
OnLocationSelected?.Invoke(null, null);
return;
}
if (index < 0 || index >= locations.Count)
{
DebugConsole.ThrowError("Location index out of bounds");
return;
}
selectedLocation = locations[index];
selectedConnection = connections.Find(c => c.Locations.Contains(currentLocation) && c.Locations.Contains(selectedLocation));
OnLocationSelected?.Invoke(selectedLocation, selectedConnection);
}
public void Save(XElement element)
{
XElement mapElement = new XElement("map");
Barotrauma/BarotraumaShared/Source/Networking/Client.cs
+3 -1
View File
@@ -36,7 +36,9 @@ namespace Barotrauma.Networking
public UInt16 lastSentEntityEventID = 0;
public UInt16 lastRecvEntityEventID = 0;
public UInt16 lastRecvCampaignUpdate = 0;
public List<ChatMessage> chatMsgQueue = new List<ChatMessage>();
public UInt16 lastChatMsgQueueID;
Barotrauma/BarotraumaShared/Source/Networking/FileTransfer/FileSender.cs
+7 -1
View File
@@ -18,7 +18,7 @@ namespace Barotrauma.Networking
enum FileTransferType
{
Submarine
Submarine, CampaignSave
}
class FileSender
@@ -277,6 +277,12 @@ namespace Barotrauma.Networking
StartTransfer(inc.SenderConnection, FileTransferType.Submarine, requestedSubmarine.FilePath);
}
break;
case (byte)FileTransferType.CampaignSave:
if (GameMain.GameSession != null)
{
StartTransfer(inc.SenderConnection, FileTransferType.CampaignSave, GameMain.GameSession.SavePath);
}
break;
}
}
Barotrauma/BarotraumaShared/Source/Networking/GameServer.cs
+25 -4
View File
@@ -611,6 +611,8 @@ namespace Barotrauma.Networking
//TODO: might want to use a clever class for this
c.lastRecvGeneralUpdate = NetIdUtils.Clamp(inc.ReadUInt16(), c.lastRecvGeneralUpdate, GameMain.NetLobbyScreen.LastUpdateID);
c.lastRecvChatMsgID = NetIdUtils.Clamp(inc.ReadUInt16(), c.lastRecvChatMsgID, c.lastChatMsgQueueID);
c.lastRecvCampaignUpdate = inc.ReadUInt16();
break;
case ClientNetObject.CHAT_MESSAGE:
ChatMessage.ServerRead(inc, c);
@@ -964,6 +966,27 @@ namespace Barotrauma.Networking
outmsg.Write(false);
outmsg.WritePadBits();
}
var campaign = GameMain.GameSession?.GameMode as MultiplayerCampaign;
if (campaign != null)
{
if (NetIdUtils.IdMoreRecent(campaign.LastUpdateID, c.lastRecvCampaignUpdate))
{
outmsg.Write(true);
outmsg.WritePadBits();
campaign.ServerWrite(outmsg, c);
}
else
{
outmsg.Write(false);
outmsg.WritePadBits();
}
}
else
{
outmsg.Write(false);
outmsg.WritePadBits();
}
outmsg.Write(c.lastSentChatMsgID); //send this to client so they know which chat messages weren't received by the server
@@ -1128,9 +1151,7 @@ namespace Barotrauma.Networking
int teamCount = 1;
byte hostTeam = 1;
string levelSeed = GameMain.NetLobbyScreen.LevelSeed;
MultiplayerCampaign campaign = GameMain.GameSession?.GameMode as MultiplayerCampaign;
//don't instantiate a new gamesession if we're playing a campaign
@@ -1310,7 +1331,7 @@ namespace Barotrauma.Networking
msg.Write(seed);
msg.Write(GameMain.NetLobbyScreen.LevelSeed);
msg.Write(GameMain.GameSession.Level.Seed);
msg.Write((byte)GameMain.NetLobbyScreen.MissionTypeIndex);
Barotrauma/BarotraumaShared/Source/Utils/SaveUtil.cs
+14 -5
View File
@@ -40,10 +40,19 @@ namespace Barotrauma
try
{
if (Submarine.MainSub != null && Submarine.Loaded.Contains(Submarine.MainSub))
string subPath = Path.Combine(tempPath, Submarine.MainSub.Name + ".sub");
if (Submarine.MainSub != null)
{
Submarine.MainSub.FilePath = Path.Combine(tempPath, Submarine.MainSub.Name + ".sub");
Submarine.MainSub.SaveAs(Submarine.MainSub.FilePath);
if (Submarine.Loaded.Contains(Submarine.MainSub))
{
Submarine.MainSub.FilePath = subPath;
Submarine.MainSub.SaveAs(Submarine.MainSub.FilePath);
}
else
{
File.Copy(Submarine.MainSub.FilePath, subPath);
Submarine.MainSub.FilePath = subPath;
}
}
}
catch (Exception e)
@@ -79,8 +88,8 @@ namespace Barotrauma
XDocument doc = ToolBox.TryLoadXml(Path.Combine(TempPath, "gamesession.xml"));
string subPath = Path.Combine(TempPath, ToolBox.GetAttributeString(doc.Root, "submarine", "")) + ".sub";
Submarine selectedMap = new Submarine(subPath, "");
GameMain.GameSession = new GameSession(selectedMap, filePath, doc);
Submarine selectedSub = new Submarine(subPath, "");
GameMain.GameSession = new GameSession(selectedSub, filePath, doc);
}
public static XDocument LoadGameSessionDoc(string filePath)