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

Merge pull request #12643 from pchote/battlefield-control

Browse Source 
Replace "Debug" prefix with "Battlefield Control" for gameplay notifications.
This commit is contained in:
RoosterDragon
2017-02-01 19:18:47 +00:00
committed by GitHub
parent cf2336793a e1f7e5dac9
commit 87040a3cf5
4 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Widgets/UnitCommandWidget.cs
View File

@@ -158,7 +158,7 @@ namespace OpenRA.Mods.Common.Widgets
return new Order("SetUnitStance", a, false) { ExtraData = (uint)nextStance };
});
Game.Debug("Unit stance set to: {0}".F(nextStance));
Game.AddChatLine(Color.White, "Battlefield Control", "Unit stance set to: {0}".F(nextStance));
return true;
}

12
OpenRA.Mods.Common/Widgets/WorldInteractionControllerWidget.cs
View File

@@ -250,12 +250,12 @@ namespace OpenRA.Mods.Common.Widgets
// Check if selecting actors on the screen has selected new units
if (ownUnitsOnScreen.Count > World.Selection.Actors.Count())
Game.Debug("Selected across screen");
Game.AddChatLine(Color.White, "Battlefield Control", "Selected across screen");
else
{
// Select actors in the world that have highest selection priority
ownUnitsOnScreen = SelectActorsInWorld(World, null, player).SubsetWithHighestSelectionPriority().ToList();
Game.Debug("Selected across map");
Game.AddChatLine(Color.White, "Battlefield Control", "Selected across map");
}
World.Selection.Combine(World, ownUnitsOnScreen, false, false);
@@ -276,12 +276,12 @@ namespace OpenRA.Mods.Common.Widgets
// Check if selecting actors on the screen has selected new units
if (newSelection.Count > World.Selection.Actors.Count())
Game.Debug("Selected across screen");
Game.AddChatLine(Color.White, "Battlefield Control", "Selected across screen");
else
{
// Select actors in the world that have the same selection class as one of the already selected actors
newSelection = SelectActorsInWorld(World, selectedClasses, player).ToList();
Game.Debug("Selected across map");
Game.AddChatLine(Color.White, "Battlefield Control", "Selected across map");
}
World.Selection.Combine(World, newSelection, true, false);
@@ -369,12 +369,12 @@ namespace OpenRA.Mods.Common.Widgets
if (Game.Settings.Sound.Mute)
{
Game.Sound.MuteAudio();
Game.Debug("Audio muted");
Game.AddChatLine(Color.White, "Battlefield Control", "Audio muted");
}
else
{
Game.Sound.UnmuteAudio();
Game.Debug("Audio unmuted");
Game.AddChatLine(Color.White, "Battlefield Control", "Audio unmuted");
}
return true;