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

Merge pull request #3550 from pchote/starting-units

Browse Source 
Support starting units.
This commit is contained in:
Matthias Mailänder
2013-07-13 00:24:05 -07:00
parent 06b06a5dad a678337d14
commit 80593ef27f
20 changed files with 275 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.FileFormats/Exts.cs
View File

@@ -110,6 +110,14 @@ namespace OpenRA
return xs[r.Next(xs.Length)];
}
public static T RandomOrDefault<T>(this IEnumerable<T> ts, Thirdparty.Random r)
{
if (!ts.Any())
return default(T);
return ts.Random(r);
}
public static float Product(this IEnumerable<float> xs)
{
return xs.Aggregate(1f, (a, x) => a * x);

2
OpenRA.FileFormats/Map/PlayerReference.cs
View File

@@ -21,7 +21,7 @@ namespace OpenRA.FileFormats
public bool NonCombatant = false;
public bool Playable = false;
public string Bot = null;
public bool DefaultStartingUnits = false;
public string StartingUnitsClass = null;
public bool AllowBots = true;
public bool Required = false;

1
OpenRA.Game/ActorInitializer.cs
View File

@@ -75,6 +75,7 @@ namespace OpenRA
[FieldFromYamlKey] public readonly int value = 0;
public SubCellInit() { }
public SubCellInit(int init) { value = init; }
public SubCellInit(SubCell init) { value = (int)init; }
public SubCell Value(World world) { return (SubCell)value; }
}

10
OpenRA.Game/ActorMap.cs
View File

@@ -64,6 +64,16 @@ namespace OpenRA
SubCell.BottomLeft, SubCell.BottomRight }.Any(b => !AnyUnitsAt(a,b));
}
public SubCell? FreeSubCell(CPos a)
{
if (!HasFreeSubCell(a))
return null;
return new[]{ SubCell.TopLeft, SubCell.TopRight, SubCell.Center,
SubCell.BottomLeft, SubCell.BottomRight }.First(b => !AnyUnitsAt(a,b));
}
public bool AnyUnitsAt(CPos a)
{
return influence[ a.X, a.Y ] != null;

2
OpenRA.Game/Map.cs
View File

@@ -38,6 +38,7 @@ namespace OpenRA
public string Author;
public string Tileset;
public string[] Difficulties;
public bool AllowStartUnitConfig = true;
[FieldLoader.Ignore] public Lazy<Dictionary<string, ActorReference>> Actors;
@@ -393,7 +394,6 @@ namespace OpenRA
Name = "Multi{0}".F(index),
Race = "Random",
Playable = true,
DefaultStartingUnits = true,
Enemies = new[] { "Creeps" }
};
Players.Add(p.Name, p);

1
OpenRA.Game/Network/Session.cs
View File

@@ -92,6 +92,7 @@ namespace OpenRA.Network
public bool Dedicated;
public string Difficulty;
public bool Crates = true;
public string StartingUnitsClass = "default";
public bool AllowVersionMismatch;
}

32
OpenRA.Mods.RA/MPStartUnits.cs Normal file
View File

@@ -0,0 +1,32 @@
#region Copyright & License Information
/*
* Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
* see COPYING.
*/
#endregion
using OpenRA.FileFormats;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
{
public class MPStartUnitsInfo : TraitInfo<MPStartUnits>
{
public readonly string Class = "default";
public readonly string[] Races = { };
public readonly string BaseActor = null;
public readonly string[] SupportActors = { };
[Desc("Inner radius for spawning support actors")]
public readonly int InnerSupportRadius = 2;
[Desc("Outer radius for spawning support actors")]
public readonly int OuterSupportRadius = 4;
}
public class MPStartUnits { }
}

9
OpenRA.Mods.RA/Move/Mobile.cs
View File

@@ -109,6 +109,11 @@ namespace OpenRA.Mods.RA.Move
return true;
}
public bool CanEnterCell(World world, CPos cell)
{
return CanEnterCell(world, null, cell, null, true, true);
}
public bool CanEnterCell(World world, Actor self, CPos cell, Actor ignoreActor, bool checkTransientActors, bool blockedByMovers)
{
if (MovementCostForCell(world, cell) == int.MaxValue)
@@ -120,13 +125,13 @@ namespace OpenRA.Mods.RA.Move
var blockingActors = world.ActorMap.GetUnitsAt(cell)
.Where(x => x != ignoreActor)
// Neutral/enemy units are blockers. Allied units that are moving are not blockers.
.Where(x => blockedByMovers || ((self.Owner.Stances[x.Owner] != Stance.Ally) || !IsMovingInMyDirection(self, x)))
.Where(x => blockedByMovers || (self == null || self.Owner.Stances[x.Owner] != Stance.Ally || !IsMovingInMyDirection(self, x)))
.ToList();
if (checkTransientActors && blockingActors.Count > 0)
{
// Non-sharable unit can enter a cell with shareable units only if it can crush all of them
if (Crushes == null)
if (self == null || Crushes == null)
return false;
if (blockingActors.Any(a => !(a.HasTrait<ICrushable>() &&

1
OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
View File

@@ -458,6 +458,7 @@
<Compile Include="Widgets\ResourceBarWidget.cs" />
<Compile Include="Widgets\Logic\SimpleTooltipLogic.cs" />
<Compile Include="World\DomainIndex.cs" />
<Compile Include="MPStartUnits.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">

26
OpenRA.Mods.RA/ServerTraits/LobbyCommands.cs
View File

@@ -399,6 +399,32 @@ namespace OpenRA.Mods.RA.Server
server.SyncLobbyInfo();
return true;
}},
{ "startingunits",
s =>
{
if (!client.IsAdmin)
{
server.SendOrderTo(conn, "Message", "Only the host can set that option");
return true;
}
if (!server.Map.AllowStartUnitConfig)
{
server.SendOrderTo(conn, "Message", "Map has disabled start unit configuration");
return true;
}
var startUnits = Rules.Info["world"].Traits.WithInterface<MPStartUnitsInfo>();
if (!startUnits.Any(msu => msu.Class == s))
{
server.SendOrderTo(conn, "Message", "Unknown unit class: {0}".F(s));
return true;
}
server.lobbyInfo.GlobalSettings.StartingUnitsClass = s;
server.SyncLobbyInfo();
return true;
}},
{ "kick",
s =>
{

73
OpenRA.Mods.RA/SpawnMPUnits.cs
View File

@@ -1,6 +1,6 @@
#region Copyright & License Information
/*
* Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
* Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
@@ -8,45 +8,70 @@
*/
#endregion
using System;
using System.Linq;
using OpenRA.FileFormats;
using OpenRA.Mods.RA.Move;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
{
class SpawnMPUnitsInfo : ITraitInfo, Requires<MPStartLocationsInfo>
public class SpawnMPUnitsInfo : TraitInfo<SpawnMPUnits>, Requires<MPStartLocationsInfo>, Requires<MPStartUnitsInfo> { }
public class SpawnMPUnits : IWorldLoaded
{
public readonly string InitialUnit = "mcv";
public readonly string Faction = null;
public object Create (ActorInitializer init) { return new SpawnMPUnits(this); }
}
class SpawnMPUnits : IWorldLoaded
{
SpawnMPUnitsInfo info;
public SpawnMPUnits(SpawnMPUnitsInfo info) { this.info = info; }
public void WorldLoaded(World world)
{
foreach (var s in world.WorldActor.Trait<MPStartLocations>().Start)
SpawnUnitsForPlayer(s.Key, s.Value);
SpawnUnitsForPlayer(world, s.Key, s.Value);
}
void SpawnUnitsForPlayer(Player p, CPos sp)
void SpawnUnitsForPlayer(World w, Player p, CPos sp)
{
if (!p.PlayerReference.DefaultStartingUnits)
return; /* they don't want an mcv, the map provides something else for them */
var spawnClass = p.PlayerReference.StartingUnitsClass ?? w.LobbyInfo.GlobalSettings.StartingUnitsClass;
var unitGroup = Rules.Info["world"].Traits.WithInterface<MPStartUnitsInfo>()
.Where(g => g.Class == spawnClass && g.Races != null && g.Races.Contains(p.Country.Race))
.RandomOrDefault(w.SharedRandom);
/* support different starting units for each faction */
if (info.Faction != null && p.Country.Race != info.Faction)
if (unitGroup == null)
throw new InvalidOperationException("No starting units defined for country {0} with class {1}".F(p.Country.Race, spawnClass));
// Spawn base actor at the spawnpoint
if (unitGroup.BaseActor != null)
{
w.CreateActor(unitGroup.BaseActor.ToLowerInvariant(), new TypeDictionary
{
new LocationInit(sp),
new OwnerInit(p),
});
}
if (!unitGroup.SupportActors.Any())
return;
p.World.CreateActor(info.InitialUnit, new TypeDictionary
// Spawn support units in an annulus around the base actor
var supportSpawnCells = w.FindTilesInCircle(sp, unitGroup.OuterSupportRadius)
.Except(w.FindTilesInCircle(sp, unitGroup.InnerSupportRadius));
foreach (var s in unitGroup.SupportActors)
{
new LocationInit( sp ),
new OwnerInit( p ),
});
var mi = Rules.Info[s.ToLowerInvariant()].Traits.Get<MobileInfo>();
var validCells = supportSpawnCells.Where(c => mi.CanEnterCell(w, c));
if (!validCells.Any())
throw new InvalidOperationException("No cells available to spawn starting unit {0}".F(s));
var cell = validCells.Random(w.SharedRandom);
var subCell = w.ActorMap.FreeSubCell(cell).Value;
w.CreateActor(s.ToLowerInvariant(), new TypeDictionary
{
new OwnerInit(p),
new LocationInit(cell),
new SubCellInit(subCell),
new FacingInit(w.SharedRandom.Next(256))
});
}
}
}
}

42
OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
View File

@@ -318,8 +318,46 @@ namespace OpenRA.Mods.RA.Widgets.Logic
difficulty.ShowDropDown("LABEL_DROPDOWN_TEMPLATE", options.Count() * 30, options, setupItem);
};
var difficultyDesc = optionsBin.GetOrNull<LabelWidget>("DIFFICULTY_DESC");
difficultyDesc.IsVisible = difficulty.IsVisible;
optionsBin.Get<LabelWidget>("DIFFICULTY_DESC").IsVisible = difficulty.IsVisible;
}
var startingUnits = optionsBin.GetOrNull<DropDownButtonWidget>("STARTINGUNITS_DROPDOWNBUTTON");
if (startingUnits != null)
{
var classNames = new Dictionary<string,string>()
{
{"none", "MCV Only"},
{"default", "Light Support"},
{"heavy", "Heavy Support"},
};
Func<string, string> className = c => classNames.ContainsKey(c) ? classNames[c] : c;
var classes = Rules.Info["world"].Traits.WithInterface<MPStartUnitsInfo>()
.Select(a => a.Class).Distinct();
startingUnits.IsDisabled = configurationDisabled;
startingUnits.IsVisible = () => Map.AllowStartUnitConfig;
startingUnits.GetText = () => className(orderManager.LobbyInfo.GlobalSettings.StartingUnitsClass);
startingUnits.OnMouseDown = _ =>
{
var options = classes.Select(c => new DropDownOption
{
Title = className(c),
IsSelected = () => orderManager.LobbyInfo.GlobalSettings.StartingUnitsClass == c,
OnClick = () => orderManager.IssueOrder(Order.Command("startingunits {0}".F(c)))
});
Func<DropDownOption, ScrollItemWidget, ScrollItemWidget> setupItem = (option, template) =>
{
var item = ScrollItemWidget.Setup(template, option.IsSelected, option.OnClick);
item.Get<LabelWidget>("LABEL").GetText = () => option.Title;
return item;
};
startingUnits.ShowDropDown("LABEL_DROPDOWN_TEMPLATE", options.Count() * 30, options, setupItem);
};
optionsBin.Get<LabelWidget>("STARTINGUNITS_DESC").IsVisible = startingUnits.IsVisible;
}
var disconnectButton = lobby.Get<ButtonWidget>("DISCONNECT_BUTTON");

14
mods/cnc/chrome/dialogs.yaml
View File

@@ -224,12 +224,18 @@ Background@LOBBY_OPTIONS_BIN:
Width:230
Height:20
Text:Enable Crates
Checkbox@FRAGILEALLIANCES_CHECKBOX:
Label@STARTINGUNITS_DESC:
X:150
Y:140
Width:230
Height:20
Text:Allow Team Changes
Width:120
Height:25
Text:Starting Units:
DropDownButton@STARTINGUNITS_DROPDOWNBUTTON:
X:245
Y:140
Width:140
Height:25
Font:Bold
Label@DIFFICULTY_DESC:
X:150
Y:170

2
mods/cnc/maps/gdi01/map.yaml
View File

@@ -20,6 +20,8 @@ UseAsShellmap: False
Type: Campaign
AllowStartUnitConfig: False
Players:
PlayerReference@BadGuy:
Name: BadGuy

2
mods/cnc/maps/nod01/map.yaml
View File

@@ -20,6 +20,8 @@ UseAsShellmap: False
Type: Campaign
AllowStartUnitConfig: False
Players:
PlayerReference@Neutral:
Name: Neutral

48
mods/cnc/rules/system.yaml
View File

@@ -307,9 +307,53 @@ World:
Depths:5,5,5,5,5,5
DebugOverlay:
SpawnMapActors:
CreateMPPlayers:
SpawnMPUnits:
MPStartLocations:
CreateMPPlayers:
MPStartUnits@mcvonly:
Class: none
Races: gdi, nod
BaseActor: mcv
MPStartUnits@defaultgdia:
Races: gdi
BaseActor: mcv
SupportActors: e1,e1,e1,e1,e1,e3,e3,jeep
MPStartUnits@defaultgdib:
Races: gdi
BaseActor: mcv
SupportActors: e1,e1,e1,e1,e1,e1,e3,apc
MPStartUnits@defaultnoda:
Races: nod
BaseActor: mcv
SupportActors: e1,e1,e1,e1,e3,bggy,bike
MPStartUnits@defaultnodb:
Races: nod
BaseActor: mcv
SupportActors: e1,e1,e1,e3,e3,e3,bggy
MPStartUnits@defaultnodc:
Races: nod
BaseActor: mcv
SupportActors: e1,e1,e1,e1,e1,e1,e1,e3,bike
MPStartUnits@heavynoda:
Class: heavy
Races: nod
BaseActor: mcv
SupportActors: e1,e1,e1,e1,e3,e3,ltnk,ltnk,ftnk
MPStartUnits@heavynodb:
Class: heavy
Races: nod
BaseActor: mcv
SupportActors: e1,e1,e1,e1,e1,e3,e3,e3,ftnk,ftnk
MPStartUnits@heavygdia:
Class: heavy
Races: gdi
BaseActor: mcv
SupportActors: e1,e1,e1,e1,e3,e3,jeep,mtnk,mtnk
MPStartUnits@heavygdib:
Class: heavy
Races: gdi
BaseActor: mcv
SupportActors: e1,e1,e1,e1,e1,e2,e2,e2,e3,e3,apc,mtnk
SpawnMPUnits:
SpatialBins:
BinSize: 4
CrateSpawner:

19
mods/d2k/rules/system.yaml
View File

@@ -380,15 +380,16 @@ World:
SpawnMapActors:
CreateMPPlayers:
MPStartLocations:
SpawnMPUnits@atreides:
InitialUnit: mcva
Faction: atreides
SpawnMPUnits@harkonnen:
InitialUnit: mcvh
Faction: harkonnen
SpawnMPUnits@ordos:
InitialUnit: mcvo
Faction: ordos
MPStartUnits@atreides:
Races: atreides
BaseActor: mcva
MPStartUnits@harkonnen:
Races: harkonnen
BaseActor: mcvh
MPStartUnits@ordos:
Races: ordos
BaseActor: mcvo
SpawnMPUnits:
SpatialBins:
BinSize: 4
PathFinder:

3
mods/ra/maps/bomber-john/map.yaml
View File

@@ -759,8 +759,7 @@ Smudges:
Rules:
World:
-CrateDrop:
SpawnMPUnits:
InitialUnit: mnlyr
-SpawnMPUnits:
APWR:
Buildable:

56
mods/ra/maps/doughnut-hole/map.yaml
View File

@@ -30,24 +30,32 @@ Players:
Race: Random
Enemies: Creeps
AllowBots: False
DefaultStartingUnits: True
StartingUnitsClass: custom
PlayerReference@Multi1:
Name: Multi1
Playable: True
Race: Random
Enemies: Creeps
AllowBots: False
DefaultStartingUnits: True
StartingUnitsClass: custom
PlayerReference@Multi2:
Name: Multi2
Playable: True
Race: Random
Enemies: Creeps
AllowBots: False
DefaultStartingUnits: True
StartingUnitsClass: custom
PlayerReference@Multi3:
Name: Multi3
Playable: True
Race: Random
Enemies: Creeps
AllowBots: False
DefaultStartingUnits: True
StartingUnitsClass: custom
PlayerReference@Creeps:
Name: Creeps
NonCombatant: True
@@ -100,18 +108,6 @@ Actors:
Actor14: t10
Location: 73,71
Owner: Neutral
Actor15: mpspawn
Location: 49,59
Owner: Neutral
Actor16: mpspawn
Location: 54,79
Owner: Neutral
Actor17: mpspawn
Location: 76,75
Owner: Neutral
Actor18: mpspawn
Location: 71,55
Owner: Neutral
Actor22: cycl
Location: 59,67
Owner: Neutral
@@ -631,30 +627,18 @@ Actors:
Actor191: v14
Location: 110,69
Owner: Neutral
Actor192: mcv
Actor15: mpspawn
Location: 48,59
Owner: Multi0
Actor193: lst
Location: 45,57
Owner: Multi0
Actor194: lst
Location: 50,81
Owner: Multi1
Actor195: mcv
Owner: Neutral
Actor16: mpspawn
Location: 52,80
Owner: Multi1
Actor196: mcv
Owner: Neutral
Actor17: mpspawn
Location: 80,76
Owner: Multi2
Actor197: lst
Location: 82,77
Owner: Multi2
Actor198: lst
Location: 75,49
Owner: Multi3
Actor199: mcv
Owner: Neutral
Actor18: mpspawn
Location: 74,51
Owner: Multi3
Owner: Neutral
Actor200: mine
Location: 104,71
Owner: Neutral
@@ -859,6 +843,14 @@ Rules:
NukePower:
AllowMultiple: yes
World:
MPStartUnits@custom:
Class: custom
Races: soviet, allies
BaseActor: mcv
SupportActors: lst
InnerSupportRadius: 3
OuterSupportRadius: 4
Sequences:
Weapons:

3
mods/ra/rules/system.yaml
View File

@@ -639,6 +639,9 @@ World:
DebugOverlay:
SpawnMapActors:
CreateMPPlayers:
MPStartUnits:
Races: soviet, allies
BaseActor: mcv
MPStartLocations:
SpawnMPUnits:
SpatialBins: