epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added fully random spawn position option.

Browse Source
This commit is contained in:
Voidwalker
2018-06-03 10:51:51 +00:00
committed by Paul Chote
parent 1408fb74b2
commit 398ae75525
9 changed files with 56 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
OpenRA.Mods.Common/Traits/World/MPStartLocations.cs
View File

@@ -18,24 +18,65 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
public class MPStartLocationsInfo : ITraitInfo
[Desc("Allows the map to have working spawnpoints. Also controls the 'Separate Team Spawns' checkbox in the lobby options.")]
public class MPStartLocationsInfo : ITraitInfo, ILobbyOptions
{
public readonly WDist InitialExploreRange = WDist.FromCells(5);
[Translate]
[Desc("Descriptive label for the spawn positions checkbox in the lobby.")]
public readonly string SeparateTeamSpawnsCheckboxLabel = "Separate Team Spawns";
[Translate]
[Desc("Tooltip description for the spawn positions checkbox in the lobby.")]
public readonly string SeparateTeamSpawnsCheckboxDescription = "Players without assigned spawn points will start as far as possible from enemy players.";
[Desc("Default value of the spawn positions checkbox in the lobby.")]
public readonly bool SeparateTeamSpawnsCheckboxEnabled = true;
[Desc("Prevent the spawn positions state from being changed in the lobby.")]
public readonly bool SeparateTeamSpawnsCheckboxLocked = false;
[Desc("Whether to display the spawn positions checkbox in the lobby.")]
public readonly bool SeparateTeamSpawnsCheckboxVisible = true;
[Desc("Display order for the spawn positions checkbox in the lobby.")]
public readonly int SeparateTeamSpawnsCheckboxDisplayOrder = 0;
public virtual object Create(ActorInitializer init) { return new MPStartLocations(this); }
IEnumerable<LobbyOption> ILobbyOptions.LobbyOptions(Ruleset rules)
{
yield return new LobbyBooleanOption(
"randomspawnpositions",
SeparateTeamSpawnsCheckboxLabel,
SeparateTeamSpawnsCheckboxDescription,
SeparateTeamSpawnsCheckboxVisible,
SeparateTeamSpawnsCheckboxDisplayOrder,
SeparateTeamSpawnsCheckboxEnabled,
SeparateTeamSpawnsCheckboxLocked);
}
}
public class MPStartLocations : IWorldLoaded
public class MPStartLocations : IWorldLoaded, INotifyCreated
{
readonly MPStartLocationsInfo info;
public readonly Dictionary<Player, CPos> Start = new Dictionary<Player, CPos>();
bool separateTeamSpawns;
public MPStartLocations(MPStartLocationsInfo info)
{
this.info = info;
}
void INotifyCreated.Created(Actor self)
{
separateTeamSpawns = self.World.LobbyInfo.GlobalSettings
.OptionOrDefault("separateteamspawns", info.SeparateTeamSpawnsCheckboxEnabled);
}
public void WorldLoaded(World world, WorldRenderer wr)
{
var spawns = world.Actors.Where(a => a.Info.Name == "mpspawn")
@@ -84,12 +125,12 @@ namespace OpenRA.Mods.Common.Traits
return world.Players.FirstOrDefault(p => p.PlayerReference.Name == pr);
}
static CPos ChooseSpawnPoint(World world, List<CPos> available, List<CPos> taken)
CPos ChooseSpawnPoint(World world, List<CPos> available, List<CPos> taken)
{
if (available.Count == 0)
throw new InvalidOperationException("No free spawnpoint.");
var n = taken.Count == 0
var n = taken.Count == 0 || !separateTeamSpawns
? world.SharedRandom.Next(available.Count)
: available // pick the most distant spawnpoint from everyone else
.Select((k, i) => Pair.New(k, i))