From e4c562ca5304ba6e0516150cdda4b0d17cfe8c7a Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Thu, 25 Dec 2014 23:23:52 +0100 Subject: [PATCH 1/5] Oppress undesired messages about difficulty changes --- OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs b/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs index 30361addf2..27d7d772c1 100644 --- a/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs +++ b/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs @@ -572,6 +572,9 @@ namespace OpenRA.Mods.Common.Server { "difficulty", s => { + if (!server.Map.Options.Difficulties.Any()) + return true; + if (!client.IsAdmin) { server.SendOrderTo(conn, "Message", "Only the host can set that option."); From 98aed777d0466ddfc4231f71acfc755dcb163fc7 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Thu, 25 Dec 2014 23:24:18 +0100 Subject: [PATCH 2/5] Improved legacy map import Health: 1 and Facing: 0 will be omitted. --- .../UtilityCommands/LegacyMapImporter.cs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/OpenRA.Mods.Common/UtilityCommands/LegacyMapImporter.cs b/OpenRA.Mods.Common/UtilityCommands/LegacyMapImporter.cs index f9bb2410a9..e2e3997323 100644 --- a/OpenRA.Mods.Common/UtilityCommands/LegacyMapImporter.cs +++ b/OpenRA.Mods.Common/UtilityCommands/LegacyMapImporter.cs @@ -387,23 +387,28 @@ namespace OpenRA.Mods.Common.UtilityCommands try { var parts = s.Value.Split(','); - var loc = Exts.ParseIntegerInvariant(parts[3]); if (parts[0] == "") parts[0] = "Neutral"; if (!players.Contains(parts[0])) players.Add(parts[0]); + var loc = Exts.ParseIntegerInvariant(parts[3]); + var health = float.Parse(parts[2], NumberFormatInfo.InvariantInfo) / 256; + var facing = (section == "INFANTRY") ? Exts.ParseIntegerInvariant(parts[6]) : Exts.ParseIntegerInvariant(parts[4]); + var actor = new ActorReference(parts[1].ToLowerInvariant()) { new LocationInit(new CPos(loc % mapSize, loc / mapSize)), new OwnerInit(parts[0]), - new HealthInit(float.Parse(parts[2], NumberFormatInfo.InvariantInfo) / 256), - new FacingInit((section == "INFANTRY") - ? Exts.ParseIntegerInvariant(parts[6]) - : Exts.ParseIntegerInvariant(parts[4])), }; + var initDict = actor.InitDict; + if (health != 1) + initDict.Add(new HealthInit(health)); + if (facing != 0) + initDict.Add(new FacingInit(facing)); + if (section == "INFANTRY") actor.Add(new SubCellInit(Exts.ParseIntegerInvariant(parts[4]))); From f2e224dd72483205801f73a3d6af5b530b717ec0 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Sat, 27 Dec 2014 19:01:54 +0100 Subject: [PATCH 3/5] Fix a crash in RemoveProximityTrigger --- OpenRA.Game/Traits/World/ActorMap.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/OpenRA.Game/Traits/World/ActorMap.cs b/OpenRA.Game/Traits/World/ActorMap.cs index 4df7cf2d48..1a43bc291d 100644 --- a/OpenRA.Game/Traits/World/ActorMap.cs +++ b/OpenRA.Game/Traits/World/ActorMap.cs @@ -150,8 +150,9 @@ namespace OpenRA.Traits public void Dispose() { - foreach (var a in currentActors) - onActorExited(a); + if (onActorExited != null) + foreach (var a in currentActors) + onActorExited(a); } } From be5fc0bc27e7c633335c76e498322d3184106b58 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Sun, 4 Jan 2015 13:05:14 +0100 Subject: [PATCH 4/5] Return from skirmish lobby to singleplayer menu instead of main menu --- OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs | 2 +- OpenRA.Mods.RA/Widgets/Logic/MainMenuLogic.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs index 7ab9f319a4..e1aa9a47ec 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs @@ -507,7 +507,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic disconnectButton.OnClick = () => { CloseWindow(); onExit(); }; if (skirmishMode) - disconnectButton.Text = "Cancel"; + disconnectButton.Text = "Back"; chatLabel = lobby.Get("LABEL_CHATTYPE"); var chatTextField = lobby.Get("CHAT_TEXTFIELD"); diff --git a/OpenRA.Mods.RA/Widgets/Logic/MainMenuLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/MainMenuLogic.cs index bfc19c4a26..2db56b88f3 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/MainMenuLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/MainMenuLogic.cs @@ -294,7 +294,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic menuType = MenuType.None; Game.OpenWindow("SERVER_LOBBY", new WidgetArgs { - { "onExit", () => { Game.Disconnect(); menuType = MenuType.Main; } }, + { "onExit", () => { Game.Disconnect(); menuType = MenuType.Singleplayer; } }, { "onStart", RemoveShellmapUI }, { "skirmishMode", true } }); From 4fed02cd74621bf4a92e1392e951b034223e9c73 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Sun, 4 Jan 2015 13:05:27 +0100 Subject: [PATCH 5/5] Make health bars 2 pixels shorter --- OpenRA.Game/Graphics/SelectionBarsRenderable.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenRA.Game/Graphics/SelectionBarsRenderable.cs b/OpenRA.Game/Graphics/SelectionBarsRenderable.cs index d430abf393..b7aab12f19 100644 --- a/OpenRA.Game/Graphics/SelectionBarsRenderable.cs +++ b/OpenRA.Game/Graphics/SelectionBarsRenderable.cs @@ -147,8 +147,8 @@ namespace OpenRA.Graphics var bounds = actor.Bounds; bounds.Offset(screenPos.X, screenPos.Y); - var start = new float2(bounds.Left, bounds.Top); - var end = new float2(bounds.Right, bounds.Top); + var start = new float2(bounds.Left + 1, bounds.Top); + var end = new float2(bounds.Right - 1, bounds.Top); DrawHealthBar(wr, health, start, end); DrawExtraBars(wr, start, end);