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

Add "Build off Ally ConYards" option. Fixes #2464.

Browse Source
This commit is contained in:
Paul Chote
2013-08-17 12:28:40 +12:00
parent 059c88ca1b
commit ce41eb2361
25 changed files with 81 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Game/Map.cs
View File

@@ -27,6 +27,7 @@ namespace OpenRA
public bool? Crates;
public bool? Fog;
public bool? Shroud;
public bool? AllyBuildRadius;
public bool? FragileAlliances;
public bool ConfigurableStartingUnits = true;
public string[] Difficulties = { };
@@ -41,6 +42,8 @@ namespace OpenRA
settings.Fog = Fog.Value;
if (Shroud.HasValue)
settings.Shroud = Shroud.Value;
if (AllyBuildRadius.HasValue)
settings.AllyBuildRadius = AllyBuildRadius.Value;
if (FragileAlliances.HasValue)
settings.FragileAlliances = FragileAlliances.Value;
}

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

@@ -94,6 +94,7 @@ namespace OpenRA.Network
public bool Crates = true;
public bool Shroud = true;
public bool Fog = true;
public bool AllyBuildRadius = true;
public string StartingUnitsClass = "none";
public bool AllowVersionMismatch;
}

10
OpenRA.Mods.RA/Buildings/BaseProvider.cs
View File

@@ -56,11 +56,17 @@ namespace OpenRA.Mods.RA.Buildings
return devMode.FastBuild || progress == 0;
}
bool ValidRenderPlayer()
{
var allyBuildRadius = self.World.LobbyInfo.GlobalSettings.AllyBuildRadius;
return self.Owner == self.World.RenderPlayer || (allyBuildRadius && self.Owner.IsAlliedWith(self.World.RenderPlayer));
}
// Range circle
public void RenderAfterWorld(WorldRenderer wr)
{
// Visible to player and allies
if (!self.Owner.IsAlliedWith(self.World.RenderPlayer))
if (!ValidRenderPlayer())
return;
wr.DrawRangeCircleWithContrast(
@@ -73,7 +79,7 @@ namespace OpenRA.Mods.RA.Buildings
public float GetValue()
{
// Visible to player and allies
if (!self.Owner.IsAlliedWith(self.World.RenderPlayer))
if (!ValidRenderPlayer())
return 0f;
// Ready or delay disabled

16
OpenRA.Mods.RA/Buildings/Building.cs
View File

@@ -43,7 +43,8 @@ namespace OpenRA.Mods.RA.Buildings
var center = topLeft.CenterPosition + FootprintUtils.CenterOffset(this);
foreach (var bp in world.ActorsWithTrait<BaseProvider>())
{
if (bp.Actor.Owner.Stances[p] != Stance.Ally || !bp.Trait.Ready())
var validOwner = bp.Actor.Owner == p || (world.LobbyInfo.GlobalSettings.AllyBuildRadius && bp.Actor.Owner.Stances[p] == Stance.Ally);
if (!validOwner || !bp.Trait.Ready())
continue;
// Range is counted from the center of the actor, not from each cell.
@@ -72,14 +73,21 @@ namespace OpenRA.Mods.RA.Buildings
var nearnessCandidates = new List<CPos>();
var bi = world.WorldActor.Trait<BuildingInfluence>();
var allyBuildRadius = world.LobbyInfo.GlobalSettings.AllyBuildRadius;
for (var y = scanStart.Y; y < scanEnd.Y; y++)
{
for (var x = scanStart.X; x < scanEnd.X; x++)
{
var at = bi.GetBuildingAt(new CPos(x, y));
if (at != null && at.Owner.Stances[p] == Stance.Ally && at.HasTrait<GivesBuildableArea>())
nearnessCandidates.Add(new CPos(x, y));
var pos = new CPos(x, y);
var at = bi.GetBuildingAt(pos);
if (at == null || !at.HasTrait<GivesBuildableArea>())
continue;
if (at.Owner == p || (allyBuildRadius && at.Owner.Stances[p] == Stance.Ally))
nearnessCandidates.Add(pos);
}
}
var buildingTiles = FootprintUtils.Tiles(buildingName, this, topLeft).ToList();
return nearnessCandidates

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

@@ -437,6 +437,25 @@ namespace OpenRA.Mods.RA.Server
server.SyncLobbyInfo();
return true;
}},
{ "allybuildradius",
s =>
{
if (!client.IsAdmin)
{
server.SendOrderTo(conn, "Message", "Only the host can set that option");
return true;
}
if (server.Map.Options.AllyBuildRadius.HasValue)
{
server.SendOrderTo(conn, "Message", "Map has disabled ally build radius configuration");
return true;
}
bool.TryParse(s, out server.lobbyInfo.GlobalSettings.AllyBuildRadius);
server.SyncLobbyInfo();
return true;
}},
{ "difficulty",
s =>
{

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

@@ -286,6 +286,15 @@ namespace OpenRA.Mods.RA.Widgets.Logic
"crates {0}".F(!orderManager.LobbyInfo.GlobalSettings.Crates)));
}
var allybuildradius = optionsBin.GetOrNull<CheckboxWidget>("ALLYBUILDRADIUS_CHECKBOX");
if (allybuildradius != null)
{
allybuildradius.IsChecked = () => orderManager.LobbyInfo.GlobalSettings.AllyBuildRadius;
allybuildradius.IsDisabled = () => Map.Options.AllyBuildRadius.HasValue || configurationDisabled();
allybuildradius.OnClick = () => orderManager.IssueOrder(Order.Command(
"allybuildradius {0}".F(!orderManager.LobbyInfo.GlobalSettings.AllyBuildRadius)));
}
var fragileAlliance = optionsBin.GetOrNull<CheckboxWidget>("FRAGILEALLIANCES_CHECKBOX");
if (fragileAlliance != null)
{

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

@@ -243,6 +243,12 @@ Background@LOBBY_OPTIONS_BIN:
Width:230
Height:20
Text:Crates Appear
Checkbox@ALLYBUILDRADIUS_CHECKBOX:
X:280
Y:35
Width:230
Height:20
Text:Build off Ally ConYards
Label@STARTINGUNITS_DESC:
X:PARENT_RIGHT - WIDTH - 145
Y:72

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

@@ -24,6 +24,7 @@ Options:
Crates: false
Fog: false
Shroud: true
AllyBuildRadius: false
FragileAlliances: false
ConfigurableStartingUnits: false

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

@@ -24,6 +24,7 @@ Options:
Crates: false
Fog: false
Shroud: true
AllyBuildRadius: false
FragileAlliances: false
ConfigurableStartingUnits: false

1
mods/cnc/maps/the-hot-box/map.yaml
View File

@@ -22,6 +22,7 @@ Options:
Fog: false
Shroud: false
Crates: true
AllyBuildRadius: false
FragileAlliances: false
ConfigurableStartingUnits: false

6
mods/ra/chrome/lobby-dialogs.yaml
View File

@@ -96,6 +96,12 @@ Background@LOBBY_OPTIONS_BIN:
Width:230
Height:20
Text:Crates Appear
Checkbox@ALLYBUILDRADIUS_CHECKBOX:
X:310
Y:40
Width:230
Height:20
Text:Build off Ally ConYards
Label@STARTINGUNITS_DESC:
X:PARENT_RIGHT - WIDTH - 145
Y:87

1
mods/ra/maps/Fort-Lonestar/map.yaml
View File

@@ -21,6 +21,7 @@ Type: Minigame
Options:
Fog: true
Shroud: true
AllyBuildRadius: false
FragileAlliances: false
ConfigurableStartingUnits: false

1
mods/ra/maps/Survival01/map.yaml
View File

@@ -21,6 +21,7 @@ Type: Minigame
Options:
Fog: true
Shroud: true
AllyBuildRadius: false
FragileAlliances: false
ConfigurableStartingUnits: false
Difficulties: Easy,Normal,Hard

1
mods/ra/maps/Survival02/map.yaml
View File

@@ -21,6 +21,7 @@ Type: Minigame
Options:
Fog: true
Shroud: true
AllyBuildRadius: false
FragileAlliances: false
ConfigurableStartingUnits: false

1
mods/ra/maps/allies-01/map.yaml
View File

@@ -23,6 +23,7 @@ Type: Campaign
Options:
Fog: true
Shroud: true
AllyBuildRadius: false
FragileAlliances: false
ConfigurableStartingUnits: false
Difficulties: Easy, Normal

1
mods/ra/maps/allies-02/map.yaml
View File

@@ -23,6 +23,7 @@ Type: Campaign
Options:
Fog: true
Shroud: true
AllyBuildRadius: false
FragileAlliances: false
ConfigurableStartingUnits: false

1
mods/ra/maps/allies-03/map.yaml
View File

@@ -23,6 +23,7 @@ Type: Campaign
Options:
Fog: true
Shroud: true
AllyBuildRadius: false
FragileAlliances: false
ConfigurableStartingUnits: false
Difficulties: Easy, Normal, Hard

1
mods/ra/maps/allies-04/map.yaml
View File

@@ -15,6 +15,7 @@ Tileset: TEMPERAT
Options:
Fog: true
Shroud: true
AllyBuildRadius: false
FragileAlliances: false
ConfigurableStartingUnits: false
Difficulties: Easy,Normal,Hard

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

@@ -21,6 +21,7 @@ Type: Minigame
Options:
Fog: true
Shroud: true
AllyBuildRadius: false
FragileAlliances: false
ConfigurableStartingUnits: false

1
mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml
View File

@@ -22,6 +22,7 @@ Options:
Fog: false
Shroud: false
Crates: true
AllyBuildRadius: false
FragileAlliances: false
ConfigurableStartingUnits: false

1
mods/ra/maps/drop-zone-w/map.yaml
View File

@@ -22,6 +22,7 @@ Options:
Fog: false
Shroud: false
Crates: true
AllyBuildRadius: false
FragileAlliances: false
ConfigurableStartingUnits: false

1
mods/ra/maps/drop-zone/map.yaml
View File

@@ -22,6 +22,7 @@ Options:
Fog: false
Shroud: false
Crates: true
AllyBuildRadius: false
FragileAlliances: false
ConfigurableStartingUnits: false

1
mods/ra/maps/monster-tank-madness/map.yaml
View File

@@ -23,6 +23,7 @@ Type: Campaign
Options:
Fog: true
Shroud: true
AllyBuildRadius: false
FragileAlliances: false
ConfigurableStartingUnits: false

1
mods/ra/maps/soviet-01-classic/map.yaml
View File

@@ -23,6 +23,7 @@ Type: Campaign
Options:
Fog: true
Shroud: true
AllyBuildRadius: false
FragileAlliances: false
ConfigurableStartingUnits: false

1
mods/ra/maps/training-camp/map.yaml
View File

@@ -21,6 +21,7 @@ Type: Minigame
Options:
Fog: true
Shroud: true
AllyBuildRadius: false
FragileAlliances: false
ConfigurableStartingUnits: false