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

fixed linebreaks in E1 longdesc; fixed some layout issues in tooltip

Browse Source
This commit is contained in:
Chris Forbes
2010-04-16 20:23:13 +12:00
parent be303230e6
commit b75de5dde8
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenRA.Game/Widgets/BuildPaletteWidget.cs
View File

@@ -458,9 +458,13 @@ namespace OpenRA.Widgets
var info = Rules.Info[unit]; var info = Rules.Info[unit];
var buildable = info.Traits.Get<BuildableInfo>(); var buildable = info.Traits.Get<BuildableInfo>();
var longDescSize = Game.chrome.renderer.RegularFont.Measure(buildable.LongDesc.Replace("\\n", "\n")); var buildings = Rules.TechTree.GatherBuildings( world.LocalPlayer );
var canBuildThis = Rules.TechTree.CanBuild(info, world.LocalPlayer, buildings);
WidgetUtils.DrawPanel("dialog4", new Rectangle(Game.viewport.Width - 300, pos.Y, 300, longDescSize.Y + 50)); var longDescSize = Game.chrome.renderer.RegularFont.Measure(buildable.LongDesc.Replace("\\n", "\n")).Y;
if (!canBuildThis) longDescSize += 8;
WidgetUtils.DrawPanel("dialog4", new Rectangle(Game.viewport.Width - 300, pos.Y, 300, longDescSize + 50));
Game.chrome.renderer.BoldFont.DrawText(buildable.Description, p.ToInt2() + new int2(5, 5), Color.White); Game.chrome.renderer.BoldFont.DrawText(buildable.Description, p.ToInt2() + new int2(5, 5), Color.White);
@@ -473,10 +477,9 @@ namespace OpenRA.Widgets
world.LocalPlayer.PowerProvided - world.LocalPlayer.PowerDrained + bi.Power >= 0 world.LocalPlayer.PowerProvided - world.LocalPlayer.PowerDrained + bi.Power >= 0
? Color.White : Color.Red); ? Color.White : Color.Red);
var buildings = Rules.TechTree.GatherBuildings( world.LocalPlayer );
p += new int2(5, 5); p += new int2(5, 20);
p += new int2(0, 15); if (!canBuildThis)
if (!Rules.TechTree.CanBuild(info, world.LocalPlayer, buildings))
{ {
var prereqs = buildable.Prerequisites var prereqs = buildable.Prerequisites
.Select( a => Description( a ) ); .Select( a => Description( a ) );
@@ -484,6 +487,8 @@ namespace OpenRA.Widgets
"Requires {0}".F(string.Join(", ", prereqs.ToArray())), "Requires {0}".F(string.Join(", ", prereqs.ToArray())),
p.ToInt2(), p.ToInt2(),
Color.White); Color.White);
p += new int2(0, 8);
} }
p += new int2(0, 15); p += new int2(0, 15);

2
mods/ra/infantry.yaml
View File

@@ -24,7 +24,7 @@ E1:
Owner: allies,soviet Owner: allies,soviet
Cost: 100 Cost: 100
Description: Rifle Infantry Description: Rifle Infantry
LongDesc: General-purpose infantry. Strong vs Infantry\n Weak vs Vehicles LongDesc: General-purpose infantry.\n Strong vs Infantry\n Weak vs Vehicles
Selectable: Selectable:
Bounds: 12,17,0,-9 Bounds: 12,17,0,-9
Unit: Unit: