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

Mission initialization fixes

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-05-18 12:23:31 +03:00
parent f931d81aed
commit 95fc1cc025
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Events/Missions/CombatMission.cs
+3 -1
View File
@@ -29,6 +29,8 @@ namespace Barotrauma
{ {
get get
{ {
if (descriptions == null) return "";
if (GameMain.NetworkMember==null || GameMain.NetworkMember.Character==null) if (GameMain.NetworkMember==null || GameMain.NetworkMember.Character==null)
{ {
//non-team-specific description //non-team-specific description
@@ -47,7 +49,7 @@ namespace Barotrauma
{ {
if (winner == -1) return ""; if (winner == -1) return "";
return SuccessMessage return base.SuccessMessage
.Replace("[loser]", teamNames[1 - winner]) .Replace("[loser]", teamNames[1 - winner])
.Replace("[winner]", teamNames[winner]); .Replace("[winner]", teamNames[winner]);
} }
Barotrauma/BarotraumaShared/Source/Events/Missions/Mission.cs
+4 -4
View File
@@ -88,9 +88,9 @@ namespace Barotrauma
for (int n = 0; n < 2; n++) for (int n = 0; n < 2; n++)
{ {
Description = Description.Replace("[location" + (n + 1) + "]", locations[n].Name); if (Description != null) Description = Description.Replace("[location" + (n + 1) + "]", locations[n].Name);
SuccessMessage = SuccessMessage.Replace("[location" + (n + 1) + "]", locations[n].Name); if (SuccessMessage != null) SuccessMessage = SuccessMessage.Replace("[location" + (n + 1) + "]", locations[n].Name);
FailureMessage = FailureMessage.Replace("[location" + (n + 1) + "]", locations[n].Name); if (FailureMessage != null) FailureMessage = FailureMessage.Replace("[location" + (n + 1) + "]", locations[n].Name);
for (int m = 0; m < Messages.Count; m++) for (int m = 0; m < Messages.Count; m++)
{ {
Messages[m] = Messages[m].Replace("[location" + (n + 1) + "]", locations[n].Name); Messages[m] = Messages[m].Replace("[location" + (n + 1) + "]", locations[n].Name);
@@ -127,7 +127,7 @@ namespace Barotrauma
} }
else else
{ {
allowedMissions = MissionPrefab.List.FindAll(m => m.Name.ToString().ToLowerInvariant().Replace("mission", "") == missionType); allowedMissions = MissionPrefab.List.FindAll(m => m.TypeMatches(missionType));
} }
if (isSinglePlayer) if (isSinglePlayer)