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

2f107db...5202af9

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-03-18 21:42:26 +02:00
parent 58c92888b7
commit 044fd3344b
395 changed files with 27417 additions and 19754 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Events/ArtifactEvent.cs
+2
View File
@@ -79,10 +79,12 @@ namespace Barotrauma
DebugConsole.NewMessage("Initialized ArtifactEvent (" + item.Name + ")", Color.White);
}
#if SERVER
if (GameMain.Server != null)
{
Entity.Spawner.CreateNetworkEvent(item, false);
}
#endif
}
public override void Update(float deltaTime)
Barotrauma/BarotraumaShared/Source/Events/EventManager.cs
+6 -4
View File
@@ -57,7 +57,7 @@ namespace Barotrauma
public void StartRound(Level level)
{
if (GameMain.Client != null) return;
if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient) return;
var suitableSettings = EventManagerSettings.List.FindAll(s =>
level.Difficulty >= s.MinLevelDifficulty &&
@@ -186,8 +186,8 @@ namespace Barotrauma
//clients only calculate the intensity but don't create any events
//(the intensity is used for controlling the background music)
CalculateCurrentIntensity(deltaTime);
if (GameMain.Client != null) { return; }
if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient) return;
roundDuration += deltaTime;
@@ -225,12 +225,14 @@ namespace Barotrauma
foreach (Character character in Character.CharacterList)
{
if (character.IsDead) continue;
#if CLIENT
if ((character.AIController is HumanAIController || character.IsRemotePlayer || character == Character.Controlled) &&
(GameMain.NetworkMember?.Character == null || GameMain.NetworkMember.Character.TeamID == character.TeamID))
(GameMain.Client?.Character == null || GameMain.Client.Character.TeamID == character.TeamID))
{
avgCrewHealth += character.Vitality / character.MaxVitality * (character.IsUnconscious ? 0.5f : 1.0f);
characterCount++;
}
#endif
}
if (characterCount > 0)
{
Barotrauma/BarotraumaShared/Source/Events/Missions/CombatMission.cs
+28 -150
View File
@@ -7,57 +7,44 @@ using System.Xml.Linq;
namespace Barotrauma
{
class CombatMission : Mission
partial class CombatMission : Mission
{
private Submarine[] subs;
private List<Character>[] crews;
private bool initialized = false;
private int state = 0;
private int winner = -1;
private string[] descriptions;
private static string[] teamNames = { "Team A", "Team B" };
private bool initialized = false;
public override bool AllowRespawn
{
get { return false; }
}
public int Winner
{
get { return winner; }
}
public override string Description
private Character.TeamType Winner
{
get
{
if (descriptions == null) return "";
if (GameMain.NetworkMember == null || GameMain.NetworkMember.Character == null)
{
//non-team-specific description
return descriptions[0];
}
//team specific
return descriptions[GameMain.NetworkMember.Character.TeamID];
if (GameMain.GameSession?.WinningTeam == null) { return Character.TeamType.None; }
return GameMain.GameSession.WinningTeam.Value;
}
}
public override string SuccessMessage
{
get
{
if (winner == -1) return "";
if (Winner == Character.TeamType.None) { return ""; }
var loser = Winner == Character.TeamType.Team1 ?
Character.TeamType.Team2 :
Character.TeamType.Team1;
return base.SuccessMessage
.Replace("[loser]", teamNames[1 - winner])
.Replace("[winner]", teamNames[winner]);
.Replace("[loser]", GetTeamName(loser))
.Replace("[winner]", GetTeamName(Winner));
}
}
@@ -86,63 +73,27 @@ namespace Barotrauma
};
}
public static string GetTeamName(int teamID)
public static string GetTeamName(Character.TeamType teamID)
{
//team IDs start from 1, while teamName array starts from 0
teamID--;
if (teamID < 0 || teamID >= teamNames.Length)
if (teamID == Character.TeamType.Team1)
{
return "Team " + teamID;
return teamNames.Length > 0 ? teamNames[0] : "Team 1";
}
else if (teamID == Character.TeamType.Team2)
{
return teamNames.Length > 1 ? teamNames[1] : "Team 2";
}
return teamNames[teamID];
return "Invalid Team";
}
public bool IsInWinningTeam(Character character)
{
return character != null && winner > -1 && character.TeamID - 1 == winner;
return character != null &&
Winner != Character.TeamType.None &&
Winner == character.TeamID;
}
public override bool AssignTeamIDs(List<Client> clients, out byte hostTeam)
{
List<Client> randList = new List<Client>(clients);
for (int i = 0; i < randList.Count; i++)
{
Client a = randList[i];
int oi = Rand.Range(0, randList.Count - 1);
Client b = randList[oi];
randList[i] = b;
randList[oi] = a;
}
int halfPlayers = randList.Count / 2;
for (int i = 0; i < randList.Count; i++)
{
if (i < halfPlayers)
{
randList[i].TeamID = 1;
}
else
{
randList[i].TeamID = 2;
}
}
if (halfPlayers * 2 == randList.Count)
{
hostTeam = (byte)Rand.Range(1, 2);
}
else if (halfPlayers * 2 < randList.Count)
{
hostTeam = 1;
}
else
{
hostTeam = 2;
}
return true;
}
public override void Start(Level level)
{
if (GameMain.NetworkMember == null)
@@ -152,7 +103,7 @@ namespace Barotrauma
}
subs = new Submarine[] { Submarine.MainSubs[0], Submarine.MainSubs[1] };
subs[0].TeamID = 1; subs[1].TeamID = 2;
subs[0].TeamID = Character.TeamType.Team1; subs[1].TeamID = Character.TeamType.Team2;
subs[1].SetPosition(subs[1].FindSpawnPos(Level.Loaded.EndPosition));
subs[1].FlipX();
@@ -182,84 +133,11 @@ namespace Barotrauma
}
}
public override void Update(float deltaTime)
{
if (!initialized)
{
crews[0].Clear();
crews[1].Clear();
foreach (Character character in Character.CharacterList)
{
if (character.TeamID == 1)
{
crews[0].Add(character);
}
else if (character.TeamID == 2)
{
crews[1].Add(character);
}
}
if (GameMain.Client != null)
{
//no characters in one of the teams, the client may not have received all spawn messages yet
if (crews[0].Count == 0 || crews[1].Count == 0) return;
}
initialized = true;
}
bool[] teamDead =
{
crews[0].All(c => c.IsDead || c.IsUnconscious),
crews[1].All(c => c.IsDead || c.IsUnconscious)
};
if (state == 0)
{
for (int i = 0; i < teamDead.Length; i++)
{
if (!teamDead[i] && teamDead[1 - i])
{
//make sure nobody in the other team can be revived because that would be pretty weird
crews[1 - i].ForEach(c => { if (!c.IsDead) c.Kill(CauseOfDeathType.Unknown, null); });
winner = i;
#if CLIENT
ShowMessage(i);
#endif
state = 1;
break;
}
}
}
else
{
if (winner >= 0)
{
#if CLIENT
GameMain.GameSession.CrewManager.WinningTeam = winner + 1;
#endif
if (GameMain.Server != null) GameMain.Server.EndGame();
}
}
if (teamDead[0] && teamDead[1])
{
#if CLIENT
GameMain.GameSession.CrewManager.WinningTeam = 0;
#endif
winner = -1;
if (GameMain.Server != null) GameMain.Server.EndGame();
}
}
public override void End()
{
if (GameMain.NetworkMember == null) return;
if (winner > -1)
if (GameMain.NetworkMember == null) return;
if (Winner != Character.TeamType.None)
{
GiveReward();
completed = true;
Barotrauma/BarotraumaShared/Source/Events/Missions/Mission.cs
+10 -9
View File
@@ -73,8 +73,8 @@ namespace Barotrauma
Prefab = prefab;
Description = prefab.Description;
SuccessMessage = prefab.SuccessMessage;
description = prefab.Description;
successMessage = prefab.SuccessMessage;
FailureMessage = prefab.FailureMessage;
Headers = new List<string>(prefab.Headers);
Messages = new List<string>(prefab.Messages);
@@ -83,9 +83,9 @@ namespace Barotrauma
for (int n = 0; n < 2; n++)
{
if (Description != null) Description = Description.Replace("[location" + (n + 1) + "]", locations[n].Name);
if (SuccessMessage != null) SuccessMessage = SuccessMessage.Replace("[location" + (n + 1) + "]", locations[n].Name);
if (FailureMessage != null) FailureMessage = FailureMessage.Replace("[location" + (n + 1) + "]", locations[n].Name);
if (description != null) description = description.Replace("[location" + (n + 1) + "]", locations[n].Name);
if (successMessage != null) successMessage = successMessage.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++)
{
Messages[m] = Messages[m].Replace("[location" + (n + 1) + "]", locations[n].Name);
@@ -103,10 +103,12 @@ namespace Barotrauma
if (missionType == MissionType.Random)
{
allowedMissions.AddRange(MissionPrefab.List);
#if SERVER
if (GameMain.Server != null)
{
allowedMissions.RemoveAll(mission => !GameMain.Server.AllowedRandomMissionTypes.Contains(mission.type));
allowedMissions.RemoveAll(mission => !GameMain.Server.ServerSettings.AllowedRandomMissionTypes.Contains(mission.type));
}
#endif
}
else if (missionType == MissionType.None)
{
@@ -141,10 +143,9 @@ namespace Barotrauma
public virtual void Update(float deltaTime) { }
public virtual bool AssignTeamIDs(List<Networking.Client> clients, out byte hostTeam)
public virtual bool AssignTeamIDs(List<Networking.Client> clients)
{
clients.ForEach(c => c.TeamID = 1);
hostTeam = 1;
clients.ForEach(c => c.TeamID = Character.TeamType.Team1);
return false;
}
Barotrauma/BarotraumaShared/Source/Events/Missions/MissionPrefab.cs
+2 -2
View File
@@ -138,10 +138,10 @@ namespace Barotrauma
foreach (Pair<string, string> allowedLocationType in AllowedLocationTypes)
{
if (allowedLocationType.First.ToLowerInvariant() == "any" ||
allowedLocationType.First.ToLowerInvariant() == from.Type.Name.ToLowerInvariant())
allowedLocationType.First.ToLowerInvariant() == from.Type.Identifier.ToLowerInvariant())
{
if (allowedLocationType.Second.ToLowerInvariant() == "any" ||
allowedLocationType.Second.ToLowerInvariant() == to.Type.Name.ToLowerInvariant())
allowedLocationType.Second.ToLowerInvariant() == to.Type.Identifier.ToLowerInvariant())
{
return true;
}
Barotrauma/BarotraumaShared/Source/Events/Missions/MonsterMission.cs
+5 -1
View File
@@ -27,7 +27,11 @@ namespace Barotrauma
{
Level.Loaded.TryGetInterestingPosition(true, Level.PositionType.MainPath, Level.Loaded.Size.X * 0.3f, out Vector2 spawnPos);
monster = Character.Create(monsterFile, spawnPos, ToolBox.RandomSeed(8), null, GameMain.Client != null, true, false);
bool isClient = false;
#if CLIENT
isClient = GameMain.Client != null;
#endif
monster = Character.Create(monsterFile, spawnPos, ToolBox.RandomSeed(8), null, isClient, true, false);
monster.Enabled = false;
sonarPosition = spawnPos;
}
Barotrauma/BarotraumaShared/Source/Events/MonsterEvent.cs
+16 -8
View File
@@ -70,11 +70,12 @@ namespace Barotrauma
if (GameMain.NetworkMember != null)
{
List<string> monsterNames = GameMain.NetworkMember.monsterEnabled.Keys.ToList();
List<string> monsterNames = GameMain.NetworkMember.ServerSettings.MonsterEnabled.Keys.ToList();
string tryKey = monsterNames.Find(s => characterFileName == s.ToLower());
if (!string.IsNullOrWhiteSpace(tryKey))
{
if (!GameMain.NetworkMember.monsterEnabled[tryKey]) disallowed = true; //spawn was disallowed by host
if (!GameMain.NetworkMember.ServerSettings.MonsterEnabled[tryKey]) disallowed = true; //spawn was disallowed by host
}
}
}
@@ -161,7 +162,7 @@ namespace Barotrauma
//only found a spawnpos that's very far from the sub, pick one that's closer
//and wait for the sub to move further before spawning
if (closestDist > 10000.0f * 10000.0f)
if (closestDist > 15000.0f * 15000.0f)
{
foreach (Vector2 position in availablePositions)
{
@@ -192,8 +193,8 @@ namespace Barotrauma
private float GetMinDistanceToSub(Submarine submarine)
{
//12000 units is slightly more than the default range of the sonar
return Math.Max(Math.Max(submarine.Borders.Width, submarine.Borders.Height), 12000.0f);
//9000 units is slightly less than the default range of the sonar
return Math.Max(Math.Max(submarine.Borders.Width, submarine.Borders.Height), 9000.0f);
}
public override void Update(float deltaTime)
@@ -224,16 +225,23 @@ namespace Barotrauma
for (int i = 0; i < amount; i++)
{
bool isClient = false;
#if CLIENT
isClient = GameMain.Client != null;
#endif
monsters[i] = Character.Create(
characterFile, spawnPos + Rand.Vector(100.0f, Rand.RandSync.Server),
i.ToString(), null, GameMain.Client != null, true, true);
i.ToString(), null, isClient, true, true);
}
spawnPending = false;
}
Entity targetEntity = Character.Controlled != null ?
(Entity)Character.Controlled : Submarine.FindClosest(GameMain.GameScreen.Cam.WorldViewCenter);
Entity targetEntity = Submarine.FindClosest(GameMain.GameScreen.Cam.WorldViewCenter);
#if CLIENT
if (Character.Controlled != null) targetEntity = (Entity)Character.Controlled;
#endif
bool monstersDead = true;
foreach (Character monster in monsters)