Enable dedicated server lint checks.
This commit is contained in:
@@ -13,21 +13,39 @@ using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using OpenRA.Mods.Common.Traits;
|
||||
using OpenRA.Server;
|
||||
using OpenRA.Traits;
|
||||
|
||||
namespace OpenRA.Mods.Common.Lint
|
||||
{
|
||||
public class CheckPlayers : ILintMapPass
|
||||
public class CheckPlayers : ILintMapPass, ILintServerMapPass
|
||||
{
|
||||
public void Run(Action<string> emitError, Action<string> emitWarning, ModData modData, Map map)
|
||||
void ILintMapPass.Run(Action<string> emitError, Action<string> emitWarning, ModData modData, Map map)
|
||||
{
|
||||
var players = new MapPlayers(map.PlayerDefinitions).Players;
|
||||
if (players.Count > 64)
|
||||
var players = new MapPlayers(map.PlayerDefinitions);
|
||||
var spawns = new List<CPos>();
|
||||
foreach (var kv in map.ActorDefinitions.Where(d => d.Value.Value == "mpspawn"))
|
||||
{
|
||||
var s = new ActorReference(kv.Value.Value, kv.Value.ToDictionary());
|
||||
spawns.Add(s.Get<LocationInit>().Value);
|
||||
}
|
||||
|
||||
Run(emitError, emitWarning, players, map.Visibility, map.Rules.Actors[SystemActors.World], spawns.ToArray());
|
||||
}
|
||||
|
||||
void ILintServerMapPass.Run(Action<string> emitError, Action<string> emitWarning, ModData modData, MapPreview map, Ruleset mapRules)
|
||||
{
|
||||
Run(emitError, emitWarning, map.Players, map.Visibility, map.WorldActorInfo, map.SpawnPoints);
|
||||
}
|
||||
|
||||
void Run(Action<string> emitError, Action<string> emitWarning, MapPlayers players, MapVisibility visibility, ActorInfo worldActorInfo, CPos[] spawnPoints)
|
||||
{
|
||||
if (players.Players.Count > 64)
|
||||
emitError("Defining more than 64 players is not allowed.");
|
||||
|
||||
var worldOwnerFound = false;
|
||||
var playerNames = players.Values.Select(p => p.Name).ToHashSet();
|
||||
foreach (var player in players.Values)
|
||||
var playerNames = players.Players.Values.Select(p => p.Name).ToHashSet();
|
||||
foreach (var player in players.Players.Values)
|
||||
{
|
||||
foreach (var ally in player.Allies)
|
||||
if (!playerNames.Contains(ally))
|
||||
@@ -46,7 +64,7 @@ namespace OpenRA.Mods.Common.Lint
|
||||
if (player.Playable)
|
||||
emitError("The player {0} owning the world can't be playable.".F(player.Name));
|
||||
}
|
||||
else if (map.Visibility == MapVisibility.MissionSelector && player.Playable && !player.LockFaction)
|
||||
else if (visibility == MapVisibility.MissionSelector && player.Playable && !player.LockFaction)
|
||||
{
|
||||
// Missions must lock the faction of the player to force the server to override the default Random faction
|
||||
emitError("The player {0} must specify LockFaction: True.".F(player.Name));
|
||||
@@ -56,51 +74,20 @@ namespace OpenRA.Mods.Common.Lint
|
||||
if (!worldOwnerFound)
|
||||
emitError("Found no player owning the world.");
|
||||
|
||||
var worldActor = map.Rules.Actors[SystemActors.World];
|
||||
var factions = worldActor.TraitInfos<FactionInfo>().Select(f => f.InternalName).ToHashSet();
|
||||
foreach (var player in players.Values)
|
||||
var factions = worldActorInfo.TraitInfos<FactionInfo>().Select(f => f.InternalName).ToHashSet();
|
||||
foreach (var player in players.Players.Values)
|
||||
if (!string.IsNullOrWhiteSpace(player.Faction) && !factions.Contains(player.Faction))
|
||||
emitError("Invalid faction {0} chosen for player {1}.".F(player.Faction, player.Name));
|
||||
|
||||
if (worldActor.HasTraitInfo<MapStartingLocationsInfo>())
|
||||
if (worldActorInfo.HasTraitInfo<MapStartingLocationsInfo>())
|
||||
{
|
||||
var playerCount = players.Count(p => p.Value.Playable);
|
||||
var spawns = new List<CPos>();
|
||||
foreach (var kv in map.ActorDefinitions.Where(d => d.Value.Value == "mpspawn"))
|
||||
{
|
||||
var s = new ActorReference(kv.Value.Value, kv.Value.ToDictionary());
|
||||
spawns.Add(s.Get<LocationInit>().Value);
|
||||
}
|
||||
var playerCount = players.Players.Count(p => p.Value.Playable);
|
||||
if (playerCount > spawnPoints.Length)
|
||||
emitError("The map allows {0} possible players, but defines only {1} spawn points".F(playerCount, spawnPoints.Length));
|
||||
|
||||
if (playerCount > spawns.Count)
|
||||
emitError("The map allows {0} possible players, but defines only {1} spawn points".F(playerCount, spawns.Count));
|
||||
|
||||
if (spawns.Distinct().Count() != spawns.Count)
|
||||
if (spawnPoints.Distinct().Count() != spawnPoints.Length)
|
||||
emitError("Duplicate spawn point locations detected.");
|
||||
}
|
||||
|
||||
// Check for actors that require specific owners
|
||||
var actorsWithRequiredOwner = map.Rules.Actors
|
||||
.Where(a => a.Value.HasTraitInfo<RequiresSpecificOwnersInfo>())
|
||||
.ToDictionary(a => a.Key, a => a.Value.TraitInfo<RequiresSpecificOwnersInfo>());
|
||||
|
||||
foreach (var kv in map.ActorDefinitions)
|
||||
{
|
||||
var actorReference = new ActorReference(kv.Value.Value, kv.Value.ToDictionary());
|
||||
var ownerInit = actorReference.GetOrDefault<OwnerInit>();
|
||||
if (ownerInit == null)
|
||||
emitError("Actor {0} is not owned by any player.".F(kv.Key));
|
||||
else
|
||||
{
|
||||
var ownerName = ownerInit.InternalName;
|
||||
if (!playerNames.Contains(ownerName))
|
||||
emitError("Actor {0} is owned by unknown player {1}.".F(kv.Key, ownerName));
|
||||
|
||||
if (actorsWithRequiredOwner.TryGetValue(kv.Value.Value, out var info))
|
||||
if (!info.ValidOwnerNames.Contains(ownerName))
|
||||
emitError("Actor {0} owner {1} is not one of ValidOwnerNames: {2}".F(kv.Key, ownerName, info.ValidOwnerNames.JoinWith(", ")));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user