diff --git a/AuroraRecordGenerator/GeneratedResultWindow.xaml b/AuroraRecordGenerator/GeneratedResultWindow.xaml
index 571d784..00b58a8 100644
--- a/AuroraRecordGenerator/GeneratedResultWindow.xaml
+++ b/AuroraRecordGenerator/GeneratedResultWindow.xaml
@@ -10,13 +10,13 @@
-
+
-
+
-
+
diff --git a/AuroraRecordGenerator/RecordEditor.xaml b/AuroraRecordGenerator/RecordEditor.xaml
index 000a573..f368021 100644
--- a/AuroraRecordGenerator/RecordEditor.xaml
+++ b/AuroraRecordGenerator/RecordEditor.xaml
@@ -35,18 +35,18 @@
Margin="10,26,5,0"
TextWrapping="Wrap" VerticalAlignment="Top"
ToolTip="Your character's first name. Required."
- Text="{Binding Path=FirstName}" controls:TextBoxHelper.Watermark="Urist" />
+ Text="{Binding Path=FirstName}" controls:TextBoxHelper.Watermark="Urist" TabIndex="1" />
+ Text="{Binding Path=MiddleName}" TabIndex="2" />
+ Text="{Binding Path=LastName}" controls:TextBoxHelper.Watermark="McScientist" TabIndex="3" />
@@ -60,7 +60,7 @@
Margin="5,26,10.5,0" TextWrapping="Wrap"
ToolTip="Your character's name suffix, if present. Optional." Grid.Column="2"
VerticalAlignment="Top"
- Text="{Binding Path=NameSuffix}" controls:TextBoxHelper.Watermark="the Third" />
+ Text="{Binding Path=NameSuffix}" controls:TextBoxHelper.Watermark="the Third" TabIndex="4" />
@@ -71,14 +71,14 @@
VerticalAlignment="Top"
ItemsSource="{Binding Source={StaticResource SpeciesEnum}}"
ToolTip="Your character's species. Required."
- SelectionChanged="SpeciesSelectChanged" Height="26"/>
+ SelectionChanged="SpeciesSelectChanged" Height="26" TabIndex="5"/>
+ Grid.Column="1" Height="26" TabIndex="6">
@@ -87,7 +87,7 @@
SelectedDateFormat="Short" DisplayDateEnd="2470-01-01"
DisplayDateStart="1955-01-01" DisplayDate="2458-01-01" Grid.Column="1"
Height="26"
- SelectedDate="{Binding Path=BirthDate}" />
+ SelectedDate="{Binding Path=BirthDate}" TabIndex="7" />
+ Text="{Binding Path=Clearance}" TabIndex="11" />
+ Text="{Binding Path=EmployedAs}" HorizontalAlignment="Left" Width="260" Grid.Column="1" TabIndex="10" />
+ Text="{Binding Path=Citizenship}" TabIndex="8" />
+ HorizontalContentAlignment="Center" TabIndex="12" />
+ HorizontalContentAlignment="Center" TabIndex="13" />
@@ -146,18 +146,18 @@
+ d:LayoutOverrides="HorizontalAlignment" Text="{Binding Path=SkinColor}" TabIndex="14" />
+ TextWrapping="Wrap" VerticalAlignment="Bottom" TabIndex="17" />
+ Text="{Binding Path=HairColor}" TabIndex="15" />
+ Text="{Binding Path=EyeColor}" TabIndex="16" />
@@ -260,16 +260,16 @@
+ Margin="10,10,0,0" VerticalAlignment="Top" TabIndex="1" />
+ ToolTip="If the character should not be fitted with prosthetics." TabIndex="3" />
+ ToolTip="If the character should not be borged." TabIndex="2" />
+ ToolTip="If the character should not be revived." TabIndex="4" />
+ Text="{Binding Path=MedicalPublicRecord}" TabIndex="5" />
+ Grid.Row="2" Text="{Binding Path=MedicalHistory}" TabIndex="6" />
+ Text="{Binding Path=MedicalNotes}" TabIndex="7" />
+ Text="{Binding Path=MedicalPsychHistory}" TabIndex="8" />
+ Text="{Binding Path=MedicalPsychNotes}" TabIndex="9" />
+ Text="{Binding Path=MedicalPrescriptions}" TabIndex="10" />
diff --git a/AuroraRecordGenerator/RecordFormatterGenerationMethods.cs b/AuroraRecordGenerator/RecordFormatterGenerationMethods.cs
index 8301be0..5c9a2c9 100644
--- a/AuroraRecordGenerator/RecordFormatterGenerationMethods.cs
+++ b/AuroraRecordGenerator/RecordFormatterGenerationMethods.cs
@@ -29,6 +29,16 @@ namespace AuroraRecordGenerator
if (_targetRecord.Weight != null)
record.AppendLine($"Weight: {_targetRecord.Weight} kg ({Utility.KgToLb(_targetRecord.Weight ?? 0)} lb)");
+ // Eye color
+ var trimmedEye = _targetRecord.EyeColor.Trim();
+ record.AppendFormat("Eye Color: {0}\n", trimmedEye.Length > 0 ? trimmedEye : "Not Specified.");
+
+ var bodyColor = _targetRecord.SkinColor.Trim();
+ record.AppendFormat("Skin/Body Color: {0}\n", bodyColor.Length > 0 ? bodyColor : "Not Specified.");
+
+ var hairColor = _targetRecord.HairColor.Trim();
+ record.AppendFormat("Hair Color: {0}\n", hairColor.Length > 0 ? hairColor : "Not Specified.");
+
// identifying features
var trimmedFeatures = _targetRecord.DistinguishingFeatures.Trim();
record.Append("Distinguishing Features: ");
diff --git a/AuroraRecordGenerator/Utility.cs b/AuroraRecordGenerator/Utility.cs
index 9a58215..1de24d9 100644
--- a/AuroraRecordGenerator/Utility.cs
+++ b/AuroraRecordGenerator/Utility.cs
@@ -27,7 +27,7 @@ namespace AuroraRecordGenerator
///
///
///
- public static string SpaceIfValue(this string val) => string.IsNullOrWhiteSpace(val) ? string.Empty : " " + val + " ";
+ public static string SpaceIfValue(this string val) => string.IsNullOrWhiteSpace(val) ? string.Empty : $" {val} ";
public static string IfEmpty(this string target, string fallback) =>
target.IsEmpty() ? fallback : target;