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

The number of completed missions in a level connection is saved (-> reloading doesn't reset the mission in the connection to the initial one). Fixes #517

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-07-24 14:34:27 +03:00
parent 4a8845c604
commit bf0c12ce52
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Map/Map/Map.cs
+16 -13
View File
@@ -418,12 +418,13 @@ namespace Barotrauma
if (int.TryParse(discoveredStrs[i], out index)) locations[index].Discovered = true; if (int.TryParse(discoveredStrs[i], out index)) locations[index].Discovered = true;
} }
string passedStr = element.GetAttributeString("passed", ""); foreach (XElement subElement in element.Elements())
string[] passedStrs = passedStr.Split(',');
for (int i = 0; i < passedStrs.Length; i++)
{ {
int index = -1; if (subElement.Name.ToString() != "connection") continue;
if (int.TryParse(passedStrs[i], out index)) connections[index].Passed = true; int connectionIndex = subElement.GetAttributeInt("i", -1);
if (connectionIndex < 0 || connectionIndex >= connections.Count) continue;
connections[connectionIndex].Passed = true;
connections[connectionIndex].MissionsCompleted = subElement.GetAttributeInt("m", 0);
} }
} }
@@ -442,12 +443,15 @@ namespace Barotrauma
} }
mapElement.Add(new XAttribute("discovered", string.Join(",", discoveredLocations))); mapElement.Add(new XAttribute("discovered", string.Join(",", discoveredLocations)));
List<int> passedConnections = new List<int>();
for (int i = 0; i < connections.Count; i++) for (int i = 0; i < connections.Count; i++)
{ {
if (connections[i].Passed) passedConnections.Add(i); if (!connections[i].Passed) continue;
var connectionElement = new XElement("connection", new XAttribute("i", i));
if (connections[i].MissionsCompleted > 0) connectionElement.Add(new XAttribute("m", connections[i].MissionsCompleted));
mapElement.Add(connectionElement);
} }
mapElement.Add(new XAttribute("passed", string.Join(",", passedConnections)));
element.Add(mapElement); element.Add(mapElement);
} }
@@ -467,7 +471,7 @@ namespace Barotrauma
public bool Passed; public bool Passed;
private int missionsCompleted; public int MissionsCompleted;
private Mission mission; private Mission mission;
public Mission Mission public Mission Mission
@@ -476,12 +480,12 @@ namespace Barotrauma
{ {
if (mission == null || mission.Completed) if (mission == null || mission.Completed)
{ {
if (mission != null && mission.Completed) missionsCompleted++; if (mission != null && mission.Completed) MissionsCompleted++;
long seed = (long)locations[0].MapPosition.X + (long)locations[0].MapPosition.Y * 100; long seed = (long)locations[0].MapPosition.X + (long)locations[0].MapPosition.Y * 100;
seed += (long)locations[1].MapPosition.X * 10000 + (long)locations[1].MapPosition.Y * 1000000; seed += (long)locations[1].MapPosition.X * 10000 + (long)locations[1].MapPosition.Y * 1000000;
MTRandom rand = new MTRandom((int)((seed + missionsCompleted) % int.MaxValue)); MTRandom rand = new MTRandom((int)((seed + MissionsCompleted) % int.MaxValue));
if (rand.NextDouble() < 0.3f) return null; if (rand.NextDouble() < 0.3f) return null;
@@ -518,8 +522,7 @@ namespace Barotrauma
public LocationConnection(Location location1, Location location2) public LocationConnection(Location location1, Location location2)
{ {
locations = new Location[] { location1, location2 }; locations = new Location[] { location1, location2 };
MissionsCompleted = 0;
missionsCompleted = 0;
} }
public Location OtherLocation(Location location) public Location OtherLocation(Location location)