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

Merge pull request #10650 from pchote/remove-fragile-diplomacy

Browse Source 
Remove fragile diplomacy.
This commit is contained in:
Oliver Brakmann
2016-02-06 22:55:55 +01:00
parent 870867760a b387e6a19e
commit a6e98620c0
24 changed files with 92 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -179,7 +179,6 @@ namespace OpenRA.Network
public int Timestep = 40;
public int OrderLatency = 3; // net tick frames (x 120 = ms)
public int RandomSeed = 0;
public bool FragileAlliances = false; // Allow diplomatic stance changes after game start.
public bool AllowCheats = false;
public bool AllowSpectators = true;
public bool Dedicated;

23
OpenRA.Game/Network/UnitOrders.cs
View File

@@ -265,29 +265,6 @@ namespace OpenRA.Network
break;
}
case "SetStance":
{
if (!Game.OrderManager.LobbyInfo.GlobalSettings.FragileAlliances)
return;
var targetPlayer = order.Player.World.Players.FirstOrDefault(p => p.InternalName == order.TargetString);
var newStance = (Stance)order.ExtraData;
order.Player.SetStance(targetPlayer, newStance);
Game.Debug("{0} has set diplomatic stance vs {1} to {2}",
order.Player.PlayerName, targetPlayer.PlayerName, newStance);
// automatically declare war reciprocally
if (newStance == Stance.Enemy && targetPlayer.Stances[order.Player] == Stance.Ally)
{
targetPlayer.SetStance(order.Player, newStance);
Game.Debug("{0} has reciprocated", targetPlayer.PlayerName);
}
break;
}
case "Ping":
{
orderManager.IssueOrder(Order.Pong(order.TargetString));