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

Merge pull request #6632 from steelphase-forks/common-widgets

Browse Source 
Mods.Common Widgets
This commit is contained in:
Paul Chote
2014-10-04 10:06:05 +13:00
parent beed736169 2f87a62ee8
commit cb85da6712
47 changed files with 91 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -146,8 +146,8 @@ mod_cnc: $(mod_cnc_TARGET)
mod_d2k_SRCS := $(shell find OpenRA.Mods.D2k/ -iname '*.cs')
mod_d2k_TARGET = mods/d2k/OpenRA.Mods.D2k.dll
mod_d2k_KIND = library
mod_d2k_DEPS = $(STD_MOD_DEPS) $(mod_ra_TARGET) $(mod_cnc_TARGET)
mod_d2k_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_ra_TARGET)
mod_d2k_DEPS = $(STD_MOD_DEPS) $(mod_common_TARGET) $(mod_ra_TARGET) $(mod_cnc_TARGET)
mod_d2k_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET) $(mod_ra_TARGET)
PROGRAMS += mod_d2k
mod_d2k: $(mod_d2k_TARGET)

2
OpenRA.Mods.Common/Graphics/TextRenderable.cs
View File

@@ -12,7 +12,7 @@ using System;
using System.Drawing;
using OpenRA.Graphics;
namespace OpenRA.Mods.RA.Graphics
namespace OpenRA.Mods.Common.Graphics
{
public struct TextRenderable : IRenderable
{

18
OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
View File

@@ -46,6 +46,8 @@
<Compile Include="Graphics\ContrailRenderable.cs" />
<Compile Include="Graphics\RangeCircleRenderable.cs" />
<Compile Include="ModChooserLoadScreen.cs" />
<Compile Include="PaletteFromFile.cs" />
<Compile Include="Traits\ProvidesRadar.cs" />
<Compile Include="ServerTraits\ColorValidator.cs" />
<Compile Include="ServerTraits\MasterServerPinger.cs" />
<Compile Include="ServerTraits\PlayerPinger.cs" />
@@ -69,8 +71,24 @@
<Compile Include="Graphics\TextRenderable.cs" />
<Compile Include="Graphics\VoxelActorPreview.cs" />
<Compile Include="Graphics\VoxelRenderable.cs" />
<Compile Include="Widgets\ConfirmationDialogs.cs" />
<Compile Include="Widgets\HueSliderWidget.cs" />
<Compile Include="Widgets\LabelWithTooltipWidget.cs" />
<Compile Include="Widgets\LogicKeyListenerWidget.cs" />
<Compile Include="Widgets\Logic\AssetBrowserLogic.cs" />
<Compile Include="Widgets\ColorMixerWidget.cs" />
<Compile Include="Widgets\LogicTickerWidget.cs" />
<Compile Include="Widgets\Logic\ButtonTooltipLogic.cs" />
<Compile Include="Widgets\Logic\ColorPickerLogic.cs" />
<Compile Include="Widgets\ColorPreviewManagerWidget.cs" />
<Compile Include="Widgets\Logic\DisconnectWatcherLogic.cs" />
<Compile Include="Widgets\Logic\Ingame\IngameRadarDisplayLogic.cs" />
<Compile Include="Widgets\Logic\Ingame\LoadIngamePlayerOrObserverUILogic.cs" />
<Compile Include="Widgets\Logic\ModBrowserLogic.cs" />
<Compile Include="Widgets\MenuButtonWidget.cs" />
<Compile Include="Widgets\RadarWidget.cs" />
<Compile Include="Widgets\ResourceBarWidget.cs" />
<Compile Include="World\RadarPings.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>

2
OpenRA.Mods.RA/PaletteFromFile.cs → OpenRA.Mods.Common/PaletteFromFile.cs
View File

@@ -12,7 +12,7 @@ using OpenRA.FileSystem;
using OpenRA.Graphics;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
namespace OpenRA.Mods.Common
{
class PaletteFromFileInfo : ITraitInfo
{

6
OpenRA.Mods.RA/ProvidesRadar.cs → OpenRA.Mods.Common/Traits/ProvidesRadar.cs Executable file → Normal file
View File

@@ -11,7 +11,7 @@
using System.Linq;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
namespace OpenRA.Mods.Common.Traits
{
[Desc("This actor enables the radar minimap.")]
public class ProvidesRadarInfo : TraitInfo<ProvidesRadar> { }
@@ -35,11 +35,11 @@ namespace OpenRA.Mods.RA
}
[Desc("When an actor with this trait is in range of an actor with ProvidesRadar, it will temporarily disable the radar minimap for the enemy player.")]
class JamsRadarInfo : TraitInfo<JamsRadar>
public class JamsRadarInfo : TraitInfo<JamsRadar>
{
[Desc("Range for jamming.")]
public readonly int Range = 0;
}
class JamsRadar { }
public class JamsRadar { }
}

2
OpenRA.Mods.RA/Widgets/ColorMixerWidget.cs → OpenRA.Mods.Common/Widgets/ColorMixerWidget.cs Executable file → Normal file
View File

@@ -14,7 +14,7 @@ using System.Threading;
using OpenRA.Graphics;
using OpenRA.Widgets;
namespace OpenRA.Mods.RA.Widgets
namespace OpenRA.Mods.Common.Widgets
{
public class ColorMixerWidget : Widget
{

2
OpenRA.Mods.RA/Widgets/ColorPreviewManagerWidget.cs → OpenRA.Mods.Common/Widgets/ColorPreviewManagerWidget.cs Executable file → Normal file
View File

@@ -12,7 +12,7 @@
using OpenRA.Graphics;
using OpenRA.Widgets;
namespace OpenRA.Mods.RA.Widgets
namespace OpenRA.Mods.Common.Widgets
{
public class ColorPreviewManagerWidget : Widget
{

2
OpenRA.Mods.RA/Widgets/ConfirmationDialogs.cs → OpenRA.Mods.Common/Widgets/ConfirmationDialogs.cs
View File

@@ -11,7 +11,7 @@
using System;
using OpenRA.Widgets;
namespace OpenRA.Mods.RA.Widgets
namespace OpenRA.Mods.Common.Widgets
{
public static class ConfirmationDialogs
{

2
OpenRA.Mods.RA/Widgets/HueSliderWidget.cs → OpenRA.Mods.Common/Widgets/HueSliderWidget.cs Executable file → Normal file
View File

@@ -13,7 +13,7 @@ using System.Drawing.Imaging;
using OpenRA.Graphics;
using OpenRA.Widgets;
namespace OpenRA.Mods.RA.Widgets
namespace OpenRA.Mods.Common.Widgets
{
public class HueSliderWidget : SliderWidget
{

2
OpenRA.Mods.RA/Widgets/LabelWithTooltipWidget.cs → OpenRA.Mods.Common/Widgets/LabelWithTooltipWidget.cs
View File

@@ -11,7 +11,7 @@
using System;
using OpenRA.Widgets;
namespace OpenRA.Mods.RA.Widgets
namespace OpenRA.Mods.Common.Widgets
{
public class LabelWithTooltipWidget : LabelWidget
{

2
OpenRA.Mods.RA/Widgets/Logic/AssetBrowserLogic.cs → OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs
View File

@@ -17,7 +17,7 @@ using OpenRA.FileSystem;
using OpenRA.Graphics;
using OpenRA.Widgets;
namespace OpenRA.Mods.RA.Widgets.Logic
namespace OpenRA.Mods.Common.Widgets.Logic
{
public class AssetBrowserLogic
{

6
OpenRA.Mods.RA/Widgets/Logic/ColorPickerLogic.cs → OpenRA.Mods.Common/Widgets/Logic/ColorPickerLogic.cs
View File

@@ -12,7 +12,7 @@ using System;
using OpenRA.Graphics;
using OpenRA.Widgets;
namespace OpenRA.Mods.RA.Widgets.Logic
namespace OpenRA.Mods.Common.Widgets.Logic
{
public class ColorPickerLogic
{
@@ -25,7 +25,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
var preview = widget.Get<SpriteSequenceWidget>("PREVIEW");
var anim = preview.GetAnimation();
anim.PlayRepeating(anim.CurrentSequence.Name);
ticker.OnTick = () => anim.Tick();
ticker.OnTick = anim.Tick;
}
var hueSlider = widget.Get<SliderWidget>("HUE");
@@ -33,7 +33,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
var randomButton = widget.GetOrNull<ButtonWidget>("RANDOM_BUTTON");
hueSlider.OnChange += _ => mixer.Set(hueSlider.Value);
mixer.OnChange += () => onChange(mixer.Color);
mixer.OnChange += () => onChange(mixer.Color);
if (randomButton != null)
randomButton.OnClick = () =>

24
OpenRA.Mods.RA/Widgets/Logic/DisconnectWatcherLogic.cs → OpenRA.Mods.Common/Widgets/Logic/DisconnectWatcherLogic.cs
View File

@@ -11,7 +11,7 @@
using OpenRA.Network;
using OpenRA.Widgets;
namespace OpenRA.Mods.RA.Widgets.Logic
namespace OpenRA.Mods.Common.Widgets.Logic
{
public class DisconnectWatcherLogic
{
@@ -21,20 +21,16 @@ namespace OpenRA.Mods.RA.Widgets.Logic
var disconnected = false;
widget.Get<LogicTickerWidget>("DISCONNECT_WATCHER").OnTick = () =>
{
if (!disconnected && orderManager.Connection.ConnectionState == ConnectionState.NotConnected)
{
Game.RunAfterTick(() =>
{
Ui.OpenWindow("CONNECTIONFAILED_PANEL", new WidgetArgs()
{
{ "orderManager", orderManager },
{ "onAbort", null },
{ "onRetry", null }
});
});
if (disconnected || orderManager.Connection.ConnectionState != ConnectionState.NotConnected)
return;
disconnected = true;
}
Game.RunAfterTick(() => Ui.OpenWindow("CONNECTIONFAILED_PANEL", new WidgetArgs {
{ "orderManager", orderManager },
{ "onAbort", null },
{ "onRetry", null }
}));
disconnected = true;
};
}
}

4
OpenRA.Mods.RA/Widgets/Logic/Ingame/IngameRadarDisplayLogic.cs → OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameRadarDisplayLogic.cs
View File

@@ -10,10 +10,10 @@
using System.Drawing;
using System.Linq;
using OpenRA.Mods.RA.Widgets;
using OpenRA.Mods.Common.Traits;
using OpenRA.Widgets;
namespace OpenRA.Mods.RA.Widgets.Logic
namespace OpenRA.Mods.Common.Widgets.Logic
{
public class IngameRadarDisplayLogic
{

7
OpenRA.Mods.RA/Widgets/Logic/Ingame/LoadIngamePlayerOrObserverUILogic.cs → OpenRA.Mods.Common/Widgets/Logic/Ingame/LoadIngamePlayerOrObserverUILogic.cs
View File

@@ -11,7 +11,7 @@
using System;
using OpenRA.Widgets;
namespace OpenRA.Mods.RA.Widgets.Logic
namespace OpenRA.Mods.Common.Widgets.Logic
{
public class LoadIngamePlayerOrObserverUILogic
{
@@ -37,18 +37,17 @@ namespace OpenRA.Mods.RA.Widgets.Logic
playerRoot.RemoveChildren();
Game.LoadWidget(world, "OBSERVER_WIDGETS", playerRoot, new WidgetArgs());
});
};
}
Game.LoadWidget(world, "CHAT_PANEL", ingameRoot, new WidgetArgs());
Action ShowLeaveMapWidget = () =>
Action showLeaveMapWidget = () =>
{
ingameRoot.RemoveChildren();
Game.LoadWidget(world, "LEAVE_MAP_WIDGET", Ui.Root, new WidgetArgs());
};
world.GameOver += ShowLeaveMapWidget;
world.GameOver += showLeaveMapWidget;
}
}
}

2
OpenRA.Mods.RA/Widgets/LogicKeyListenerWidget.cs → OpenRA.Mods.Common/Widgets/LogicKeyListenerWidget.cs
View File

@@ -11,7 +11,7 @@
using System;
using OpenRA.Widgets;
namespace OpenRA.Mods.RA.Widgets
namespace OpenRA.Mods.Common.Widgets
{
public class LogicKeyListenerWidget : Widget
{

2
OpenRA.Mods.RA/Widgets/LogicTickerWidget.cs → OpenRA.Mods.Common/Widgets/LogicTickerWidget.cs
View File

@@ -11,7 +11,7 @@
using System;
using OpenRA.Widgets;
namespace OpenRA.Mods.RA.Widgets
namespace OpenRA.Mods.Common.Widgets
{
public class LogicTickerWidget : Widget
{

2
OpenRA.Mods.RA/Widgets/MenuButtonWidget.cs → OpenRA.Mods.Common/Widgets/MenuButtonWidget.cs
View File

@@ -10,7 +10,7 @@
using OpenRA.Widgets;
namespace OpenRA.Mods.RA.Widgets
namespace OpenRA.Mods.Common.Widgets
{
public class MenuButtonWidget : ButtonWidget
{

2
OpenRA.Mods.RA/Widgets/RadarWidget.cs → OpenRA.Mods.Common/Widgets/RadarWidget.cs Executable file → Normal file
View File

@@ -14,7 +14,7 @@ using System.Linq;
using OpenRA.Graphics;
using OpenRA.Widgets;
namespace OpenRA.Mods.RA.Widgets
namespace OpenRA.Mods.Common.Widgets
{
public class RadarWidget : Widget
{

2
OpenRA.Mods.RA/Widgets/ResourceBarWidget.cs → OpenRA.Mods.Common/Widgets/ResourceBarWidget.cs
View File

@@ -13,7 +13,7 @@ using System.Drawing;
using OpenRA.Graphics;
using OpenRA.Widgets;
namespace OpenRA.Mods.RA.Widgets
namespace OpenRA.Mods.Common.Widgets
{
public enum ResourceBarOrientation { Vertical, Horizontal }
public enum ResourceBarStyle { Flat, Bevelled }

2
OpenRA.Mods.RA/World/RadarPings.cs → OpenRA.Mods.Common/World/RadarPings.cs
View File

@@ -13,7 +13,7 @@ using System.Collections.Generic;
using System.Drawing;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
namespace OpenRA.Mods.Common
{
public class RadarPingsInfo : ITraitInfo
{

9
OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj
View File

@@ -96,6 +96,10 @@ cd "$(SolutionDir)"</PostBuildEvent>
<Project>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</Project>
<Name>OpenRA.Game</Name>
</ProjectReference>
<ProjectReference Include="..\OpenRA.Mods.Common\OpenRA.Mods.Common.csproj">
<Project>{fe6c8cc0-2f07-442a-b29f-17617b3b7fc6}</Project>
<Name>OpenRA.Mods.Common</Name>
</ProjectReference>
<ProjectReference Include="..\OpenRA.Mods.RA\OpenRA.Mods.RA.csproj">
<Project>{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}</Project>
<Name>OpenRA.Mods.RA</Name>
@@ -119,8 +123,5 @@ cd "$(SolutionDir)"</PostBuildEvent>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup />
<ItemGroup>
<Folder Include="Widgets\" />
<Folder Include="Widgets\Logic\" />
</ItemGroup>
<ItemGroup />
</Project>

2
OpenRA.Mods.D2k/Widgets/Logic/IngameChromeLogic.cs
View File

@@ -18,6 +18,8 @@ using OpenRA.Mods.RA.Widgets.Logic;
using OpenRA.Mods.D2k.Widgets;
using OpenRA.Traits;
using OpenRA.Widgets;
using OpenRA.Mods.Common.Widgets;
using OpenRA.Mods.Common.Traits;
namespace OpenRA.Mods.D2k.Widgets.Logic
{

2
OpenRA.Mods.RA/Effects/FloatingText.cs
View File

@@ -13,7 +13,7 @@ using System.Collections.Generic;
using System.Drawing;
using OpenRA.Effects;
using OpenRA.Graphics;
using OpenRA.Mods.RA.Graphics;
using OpenRA.Mods.Common.Graphics;
namespace OpenRA.Mods.RA.Effects
{

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

@@ -274,7 +274,6 @@
<Compile Include="OreRefinery.cs" />
<Compile Include="PlayerPaletteFromCurrentTileset.cs" />
<Compile Include="PaletteFromCurrentTileset.cs" />
<Compile Include="PaletteFromFile.cs" />
<Compile Include="PaletteFromRGBA.cs" />
<Compile Include="ParaDrop.cs" />
<Compile Include="Passenger.cs" />
@@ -295,12 +294,10 @@
<Compile Include="Warheads\CreateResourceWarhead.cs" />
<Compile Include="Warheads\LeaveSmudgeWarhead.cs" />
<Compile Include="Widgets\Logic\TabCompletionLogic.cs" />
<Compile Include="World\RadarPings.cs" />
<Compile Include="Player\TechTree.cs" />
<Compile Include="PrimaryBuilding.cs" />
<Compile Include="Production.cs" />
<Compile Include="ProductionBar.cs" />
<Compile Include="ProvidesRadar.cs" />
<Compile Include="ProximityCaptor.cs" />
<Compile Include="ProximityCapturable.cs" />
<Compile Include="DefaultLoadScreen.cs" />
@@ -372,7 +369,6 @@
<Compile Include="Turreted.cs" />
<Compile Include="Valued.cs" />
<Compile Include="WaterPaletteRotation.cs" />
<Compile Include="Widgets\LogicTickerWidget.cs" />
<Compile Include="Widgets\Logic\KickSpectatorsLogic.cs" />
<Compile Include="Widgets\Logic\MissionBrowserLogic.cs" />
<Compile Include="Widgets\Logic\IngameMenuLogic.cs" />
@@ -383,7 +379,6 @@
<Compile Include="Widgets\Logic\Ingame\LeaveMapLogic.cs" />
<Compile Include="Widgets\Logic\IrcLogic.cs" />
<Compile Include="Widgets\Logic\KickClientLogic.cs" />
<Compile Include="Widgets\Logic\ColorPickerLogic.cs" />
<Compile Include="Widgets\Logic\ConnectionLogic.cs" />
<Compile Include="Widgets\Logic\DiplomacyLogic.cs" />
<Compile Include="Widgets\Logic\DirectConnectLogic.cs" />
@@ -402,7 +397,6 @@
<Compile Include="Widgets\Logic\ServerCreationLogic.cs" />
<Compile Include="Widgets\ObserverProductionIconsWidget.cs" />
<Compile Include="Widgets\ObserverSupportPowerIconsWidget.cs" />
<Compile Include="Widgets\RadarWidget.cs" />
<Compile Include="Widgets\StrategicProgressWidget.cs" />
<Compile Include="Widgets\SupportPowerTimerWidget.cs" />
<Compile Include="Widgets\WorldCommandWidget.cs" />
@@ -416,7 +410,6 @@
<Compile Include="Infiltration\InfiltrateForCash.cs" />
<Compile Include="RenderShroudCircle.cs" />
<Compile Include="CloakPaletteEffect.cs" />
<Compile Include="Widgets\ColorPreviewManagerWidget.cs" />
<Compile Include="Infiltration\Infiltrates.cs" />
<Compile Include="Armament.cs" />
<Compile Include="Buildings\BaseProvider.cs" />
@@ -427,11 +420,8 @@
<Compile Include="Lint\CheckSequences.cs" />
<Compile Include="Widgets\Logic\SpawnSelectorTooltipLogic.cs" />
<Compile Include="Widgets\Logic\ClientTooltipLogic.cs" />
<Compile Include="Widgets\ColorMixerWidget.cs" />
<Compile Include="Widgets\HueSliderWidget.cs" />
<Compile Include="Render\WithTurret.cs" />
<Compile Include="Render\WithBarrel.cs" />
<Compile Include="Widgets\Logic\AssetBrowserLogic.cs" />
<Compile Include="VoxelNormalsPalette.cs" />
<Compile Include="Render\RenderVoxels.cs" />
<Compile Include="Render\WithVoxelTurret.cs" />
@@ -440,7 +430,6 @@
<Compile Include="Widgets\Logic\CreditsLogic.cs" />
<Compile Include="Render\WithResources.cs" />
<Compile Include="Render\WithHarvestAnimation.cs" />
<Compile Include="Widgets\ResourceBarWidget.cs" />
<Compile Include="Widgets\Logic\SimpleTooltipLogic.cs" />
<Compile Include="World\DomainIndex.cs" />
<Compile Include="MPStartUnits.cs" />
@@ -465,7 +454,6 @@
<Compile Include="ShroudRenderer.cs" />
<Compile Include="Render\WithCrateBody.cs" />
<Compile Include="Buildings\Demolishable.cs" />
<Compile Include="Widgets\Logic\DisconnectWatcherLogic.cs" />
<Compile Include="Activities\FlyFollow.cs" />
<Compile Include="Modifiers\DisabledOverlay.cs" />
<Compile Include="Widgets\Logic\GameTimerLogic.cs" />
@@ -477,12 +465,10 @@
<Compile Include="Attack\AttackGarrisoned.cs" />
<Compile Include="Widgets\Logic\LobbyMapPreviewLogic.cs" />
<Compile Include="Orders\BeaconOrderGenerator.cs" />
<Compile Include="Widgets\LogicKeyListenerWidget.cs" />
<Compile Include="Widgets\Logic\ControlGroupLogic.cs" />
<Compile Include="Buildings\LineBuildNode.cs" />
<Compile Include="Render\WithBuildingPlacedAnimation.cs" />
<Compile Include="StartGameNotification.cs" />
<Compile Include="Widgets\ConfirmationDialogs.cs" />
<Compile Include="Scripting\LuaScript.cs" />
<Compile Include="Scripting\CallLuaFunc.cs" />
<Compile Include="Scripting\Global\ActorGlobal.cs" />
@@ -529,7 +515,6 @@
<Compile Include="Widgets\ProductionTabsWidget.cs" />
<Compile Include="Widgets\ProductionTypeButtonWidget.cs" />
<Compile Include="Widgets\Logic\ProductionTooltipLogic.cs" />
<Compile Include="Widgets\Logic\Ingame\IngameRadarDisplayLogic.cs" />
<Compile Include="Widgets\Logic\Ingame\IngameCashCounterLogic.cs" />
<Compile Include="Widgets\Logic\Ingame\IngamePowerCounterLogic.cs" />
<Compile Include="Widgets\Logic\Ingame\IngamePowerBarLogic.cs" />
@@ -539,10 +524,7 @@
<Compile Include="Widgets\SupportPowersWidget.cs" />
<Compile Include="Widgets\Logic\SupportPowerTooltipLogic.cs" />
<Compile Include="Widgets\Logic\SupportPowerBinLogic.cs" />
<Compile Include="Widgets\Logic\Ingame\LoadIngamePlayerOrObserverUILogic.cs" />
<Compile Include="Widgets\MenuButtonWidget.cs" />
<Compile Include="Widgets\Logic\DebugMenuLogic.cs" />
<Compile Include="Widgets\LabelWithTooltipWidget.cs" />
<Compile Include="ProductionQueueFromSelection.cs" />
<Compile Include="Scripting\Global\MediaGlobal.cs" />
<Compile Include="GlobalUpgradable.cs" />

1
OpenRA.Mods.RA/Player/BaseAttackNotifier.cs
View File

@@ -9,6 +9,7 @@
#endregion
using System.Drawing;
using OpenRA.Mods.Common;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Traits;

1
OpenRA.Mods.RA/Player/HarvesterAttackNotifier.cs
View File

@@ -9,6 +9,7 @@
#endregion
using System.Drawing;
using OpenRA.Mods.Common;
using OpenRA.Traits;
namespace OpenRA.Mods.RA

1
OpenRA.Mods.RA/Player/PlaceBeacon.cs
View File

@@ -8,6 +8,7 @@
*/
#endregion
using OpenRA.Mods.Common;
using OpenRA.Mods.RA.Effects;
using OpenRA.Traits;

2
OpenRA.Mods.RA/Render/RenderNameTag.cs
View File

@@ -11,7 +11,7 @@
using System.Collections.Generic;
using System.Drawing;
using OpenRA.Graphics;
using OpenRA.Mods.RA.Graphics;
using OpenRA.Mods.Common.Graphics;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render

15
OpenRA.Mods.RA/RenderJammerCircle.cs
View File

@@ -12,11 +12,12 @@ using System.Collections.Generic;
using System.Drawing;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
{
//todo: remove all the Render*Circle duplication
// TODO: remove all the Render*Circle duplication
class RenderJammerCircleInfo : ITraitInfo, IPlaceBuildingDecoration
{
public IEnumerable<IRenderable> Render(WorldRenderer wr, World w, ActorInfo ai, WPos centerPosition)
@@ -29,8 +30,7 @@ namespace OpenRA.Mods.RA
WRange.FromCells(jamsMissiles.Range),
0,
Color.FromArgb(128, Color.Red),
Color.FromArgb(96, Color.Black)
);
Color.FromArgb(96, Color.Black));
}
var jamsRadar = ai.Traits.GetOrDefault<JamsRadarInfo>();
@@ -41,8 +41,7 @@ namespace OpenRA.Mods.RA
WRange.FromCells(jamsRadar.Range),
0,
Color.FromArgb(128, Color.Blue),
Color.FromArgb(96, Color.Black)
);
Color.FromArgb(96, Color.Black));
}
foreach (var a in w.ActorsWithTrait<RenderJammerCircle>())
@@ -73,8 +72,7 @@ namespace OpenRA.Mods.RA
WRange.FromCells(jamsMissiles.Range),
0,
Color.FromArgb(128, Color.Red),
Color.FromArgb(96, Color.Black)
);
Color.FromArgb(96, Color.Black));
}
var jamsRadar = self.Info.Traits.GetOrDefault<JamsRadarInfo>();
@@ -85,8 +83,7 @@ namespace OpenRA.Mods.RA
WRange.FromCells(jamsRadar.Range),
0,
Color.FromArgb(128, Color.Blue),
Color.FromArgb(96, Color.Black)
);
Color.FromArgb(96, Color.Black));
}
}
}

1
OpenRA.Mods.RA/SupportPowers/SupportPower.cs
View File

@@ -8,6 +8,7 @@
*/
#endregion
using OpenRA.Mods.Common;
using OpenRA.Traits;
namespace OpenRA.Mods.RA

1
OpenRA.Mods.RA/SupportPowers/SupportPowerManager.cs
View File

@@ -12,6 +12,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common;
using OpenRA.Traits;
namespace OpenRA.Mods.RA

1
OpenRA.Mods.RA/Widgets/Logic/ClassicProductionLogic.cs
View File

@@ -13,6 +13,7 @@ using System.Linq;
using OpenRA.Mods.RA.Widgets;
using OpenRA.Network;
using OpenRA.Widgets;
using OpenRA.Mods.Common.Widgets;
namespace OpenRA.Mods.RA.Widgets.Logic
{

1
OpenRA.Mods.RA/Widgets/Logic/ConnectionLogic.cs
View File

@@ -9,6 +9,7 @@
#endregion
using System;
using OpenRA.Mods.Common.Widgets;
using OpenRA.Network;
using OpenRA.Widgets;

1
OpenRA.Mods.RA/Widgets/Logic/ControlGroupLogic.cs
View File

@@ -9,6 +9,7 @@
#endregion
using OpenRA.Graphics;
using OpenRA.Mods.Common.Widgets;
using OpenRA.Widgets;
namespace OpenRA.Mods.RA.Widgets.Logic

1
OpenRA.Mods.RA/Widgets/Logic/Ingame/IngameCashCounterLogic.cs
View File

@@ -8,6 +8,7 @@
*/
#endregion
using OpenRA.Mods.Common.Widgets;
using OpenRA.Traits;
using OpenRA.Widgets;

1
OpenRA.Mods.RA/Widgets/Logic/Ingame/IngamePowerBarLogic.cs
View File

@@ -9,6 +9,7 @@
#endregion
using System.Drawing;
using OpenRA.Mods.Common.Widgets;
using OpenRA.Mods.RA.Power;
using OpenRA.Widgets;

3
OpenRA.Mods.RA/Widgets/Logic/Ingame/IngamePowerCounterLogic.cs
View File

@@ -8,9 +8,10 @@
*/
#endregion
using System.Drawing;
using OpenRA.Mods.Common.Widgets;
using OpenRA.Mods.RA.Power;
using OpenRA.Widgets;
using System.Drawing;
namespace OpenRA.Mods.RA.Widgets.Logic
{

1
OpenRA.Mods.RA/Widgets/Logic/Ingame/IngameSiloBarLogic.cs
View File

@@ -9,6 +9,7 @@
#endregion
using System.Drawing;
using OpenRA.Mods.Common.Widgets;
using OpenRA.Traits;
using OpenRA.Widgets;

5
OpenRA.Mods.RA/Widgets/Logic/IngameMenuLogic.cs
View File

@@ -9,11 +9,8 @@
#endregion
using System;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.RA;
using OpenRA.Mods.RA.Widgets;
using OpenRA.Traits;
using OpenRA.Mods.Common.Widgets;
using OpenRA.Widgets;
namespace OpenRA.Mods.RA.Widgets.Logic

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

@@ -14,6 +14,7 @@ using System.Drawing;
using System.Linq;
using System.Threading;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Widgets;
using OpenRA.Network;
using OpenRA.Traits;
using OpenRA.Widgets;

1
OpenRA.Mods.RA/Widgets/Logic/LobbyUtils.cs
View File

@@ -13,6 +13,7 @@ using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Widgets;
using OpenRA.Network;
using OpenRA.Primitives;
using OpenRA.Traits;

1
OpenRA.Mods.RA/Widgets/Logic/ObserverShroudSelectorLogic.cs
View File

@@ -12,6 +12,7 @@ using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using OpenRA.Mods.Common.Widgets;
using OpenRA.Network;
using OpenRA.Widgets;

1
OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs
View File

@@ -13,6 +13,7 @@ using System.Linq;
using OpenRA.Mods.RA.Orders;
using OpenRA.Widgets;
using OpenRA.Traits;
using OpenRA.Mods.Common.Widgets;
namespace OpenRA.Mods.RA.Widgets.Logic
{

1
OpenRA.Mods.RA/Widgets/Logic/ReplayBrowserLogic.cs
View File

@@ -13,6 +13,7 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using OpenRA.FileFormats;
using OpenRA.Mods.Common.Widgets;
using OpenRA.Primitives;
using OpenRA.Widgets;

1
OpenRA.Mods.RA/Widgets/Logic/SettingsLogic.cs
View File

@@ -13,6 +13,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Widgets;
using OpenRA.Widgets;
namespace OpenRA.Mods.RA.Widgets.Logic

1
OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs
View File

@@ -12,6 +12,7 @@ using System;
using System.Drawing;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common;
using OpenRA.Orders;
using OpenRA.Primitives;
using OpenRA.Widgets;