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

Functional level generation + moving the submarine

Browse Source
This commit is contained in:
Regalis
2015-06-26 23:05:51 +03:00
parent bda9b31cbe
commit 9237a9efe2
48 changed files with 1629 additions and 750 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
Subsurface/GameSession/GameSession.cs
View File

@@ -27,15 +27,29 @@ namespace Subsurface
private string savePath;
private Map selectedMap;
private Submarine submarine;
public GameSession(Map selectedMap, GameModePreset gameModePreset)
:this(selectedMap, gameModePreset.Instantiate())
private Level level;
public Map map;
public Level Level
{
get { return level; }
}
public Submarine Submarine
{
get { return submarine; }
}
public GameSession(Submarine submarine, GameModePreset gameModePreset)
:this(submarine, gameModePreset.Instantiate())
{
}
public GameSession(Map selectedMap, GameMode gameMode = null)
public GameSession(Submarine selectedMap, GameMode gameMode = null)
{
taskManager = new TaskManager(this);
@@ -43,6 +57,8 @@ namespace Subsurface
guiRoot = new GUIFrame(new Rectangle(0,0,Game1.GraphicsWidth,Game1.GraphicsWidth), Color.Transparent);
map = new Map(Game1.random.Next(), 500);
int width = 350, height = 100;
if (Game1.Client!=null || Game1.Server!=null)
{
@@ -67,7 +83,7 @@ namespace Subsurface
//startTime = DateTime.Now;
//endTime = startTime + gameDuration;
this.selectedMap = selectedMap;
this.submarine = selectedMap;
//if (!save) return;
@@ -75,7 +91,7 @@ namespace Subsurface
}
public GameSession(Map selectedMap, string savePath, string filePath)
public GameSession(Submarine selectedMap, string savePath, string filePath)
: this(selectedMap)
{
XDocument doc = ToolBox.TryLoadXml(filePath);
@@ -95,14 +111,31 @@ namespace Subsurface
this.savePath = savePath;
}
public void StartShift(TimeSpan duration, Level level)
{
if (Submarine.Loaded != submarine) submarine.Load();
level.Generate(submarine==null ? 100.0f : Math.Max(Submarine.Borders.Width, Submarine.Borders.Height));
this.level = level;
StartShift(duration, 1);
}
public void StartShift(TimeSpan duration, int scriptedEventCount = 1)
{
//if (crewManager.characterInfos.Count == 0) return;
if (Map.Loaded!=selectedMap) selectedMap.Load();
if (Submarine.Loaded!=submarine) submarine.Load();
if (gameMode!=null) gameMode.Start(duration);
if (level!=null)
{
submarine.Move(level.StartPosition - submarine.Center, 1.0f);
}
//crewManager.StartShift();
taskManager.StartShift(scriptedEventCount);
}
@@ -122,7 +155,7 @@ namespace Subsurface
SaveUtil.SaveGame(savePath);
}
taskManager.EndShift();
//gameMode.End();