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

Unstable 0.1500.1.0 (BaroDev edition)

Browse Source
This commit is contained in:
Markus Isberg
2021-09-03 21:56:31 +09:00
parent 501e02c026
commit e7b7c1a748
143 changed files with 2928 additions and 1356 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/GameSession/GameModes/CampaignMode.cs
+1
View File
@@ -531,6 +531,7 @@ namespace Barotrauma
if (Level.Loaded.EndOutpost == null)
{
Submarine closestSub = Submarine.FindClosest(Level.Loaded.EndExitPosition, ignoreOutposts: true, ignoreRespawnShuttle: true, teamType: leavingPlayers.FirstOrDefault()?.TeamID);
if (closestSub == null) { return null; }
return closestSub.DockedTo.Contains(Submarine.MainSub) ? Submarine.MainSub : closestSub;
}
else
Barotrauma/BarotraumaShared/SharedSource/GameSession/GameModes/MultiPlayerCampaign.cs
+6
View File
@@ -173,6 +173,12 @@ namespace Barotrauma
if (matchingSub != null) { availableSubs.Add(matchingSub); }
}
break;
case "savedexperiencepoints":
foreach (XElement savedExp in subElement.Elements())
{
savedExperiencePoints.Add(new SavedExperiencePoints(savedExp));
}
break;
#endif
}
}
Barotrauma/BarotraumaShared/SharedSource/GameSession/GameSession.cs
+11 -6
View File
@@ -661,7 +661,7 @@ namespace Barotrauma
#if SERVER
return GameMain.Server.ConnectedClients.Select(c => c.Character).Where(c => c.Info != null);
#else
return GameMain.GameSession.CrewManager.CharacterInfos.Select(i => i.Character).Where(c => c != null);
return GameMain.GameSession.CrewManager.GetCharacters().Where(c => c.Info != null);
#endif
}
@@ -671,28 +671,33 @@ namespace Barotrauma
try
{
IEnumerable<Character> crewCharacters = GameSession.GetSessionCrewCharacters();
IEnumerable<Character> crewCharacters = GetSessionCrewCharacters();
foreach (Mission mission in missions)
{
mission.End();
}
foreach (Character character in crewCharacters)
{
character.CheckTalents(AbilityEffectType.OnRoundEnd);
}
if (missions.Any())
{
if (missions.Any(m => m.Completed))
{
foreach (CharacterInfo characterInfo in GameMain.GameSession.CrewManager.CharacterInfos)
foreach (Character character in crewCharacters)
{
characterInfo.Character?.CheckTalents(AbilityEffectType.OnAnyMissionCompleted);
character.CheckTalents(AbilityEffectType.OnAnyMissionCompleted);
}
}
if (missions.All(m => m.Completed))
{
foreach (CharacterInfo characterInfo in GameMain.GameSession.CrewManager.CharacterInfos)
foreach (Character character in crewCharacters)
{
characterInfo.Character?.CheckTalents(AbilityEffectType.OnAllMissionsCompleted);
character.CheckTalents(AbilityEffectType.OnAllMissionsCompleted);
}
}
}