From 1d0c9a3abddb606a3739095c4f33a4c0b92785fb Mon Sep 17 00:00:00 2001 From: Llywelwyn Date: Sun, 24 Jul 2022 17:19:24 +0100 Subject: [PATCH] adds attitude fields - added attitude towards crew field - added attitude towards scc field - default species is human instead of none --- AuroraRecordGenerator/Record.cs | 6 +++ AuroraRecordGenerator/RecordEditor.xaml | 39 +++++++++++++++---- AuroraRecordGenerator/RecordEditor.xaml.cs | 2 +- AuroraRecordGenerator/RecordFormatter.cs | 4 ++ .../RecordFormatterGenerationMethods.cs | 15 ++++++- AuroraRecordGenerator/Types.cs | 20 ++++++++++ 6 files changed, 77 insertions(+), 9 deletions(-) diff --git a/AuroraRecordGenerator/Record.cs b/AuroraRecordGenerator/Record.cs index 4b7ac46..08cc3a3 100644 --- a/AuroraRecordGenerator/Record.cs +++ b/AuroraRecordGenerator/Record.cs @@ -112,5 +112,11 @@ namespace AuroraRecordGenerator [ProtoMember(37)] public string EmploymentSkills { get; set; } = string.Empty; + + [ProtoMember(38)] + public string SecurityAttitudeScc { get; set; } = string.Empty; + + [ProtoMember(39)] + public string SecurityAttitudeCrew { get; set; } = string.Empty; } } \ No newline at end of file diff --git a/AuroraRecordGenerator/RecordEditor.xaml b/AuroraRecordGenerator/RecordEditor.xaml index 53d2a46..fdcf02f 100644 --- a/AuroraRecordGenerator/RecordEditor.xaml +++ b/AuroraRecordGenerator/RecordEditor.xaml @@ -17,6 +17,11 @@ + + + + + @@ -296,11 +301,11 @@ ToolTip="Dated list of operations, surgeries, checkups of note, etc. One per line." Grid.Row="2" Text="{Binding Path=MedicalHistory}" TabIndex="6" /> + + + + + + + + + + - + Grid.Row="3" Text="{Binding Path=SecurityNotes}" /> diff --git a/AuroraRecordGenerator/RecordEditor.xaml.cs b/AuroraRecordGenerator/RecordEditor.xaml.cs index f56f171..2d7f09b 100644 --- a/AuroraRecordGenerator/RecordEditor.xaml.cs +++ b/AuroraRecordGenerator/RecordEditor.xaml.cs @@ -46,7 +46,7 @@ namespace AuroraRecordGenerator private void WindowLoaded(object sender, RoutedEventArgs e) { - SpeciesCombo.SelectedIndex = 0; + SpeciesCombo.SelectedIndex = 1; } private void GenerateRecord(object sender, RoutedEventArgs e) diff --git a/AuroraRecordGenerator/RecordFormatter.cs b/AuroraRecordGenerator/RecordFormatter.cs index 6cbb278..cc52ea8 100644 --- a/AuroraRecordGenerator/RecordFormatter.cs +++ b/AuroraRecordGenerator/RecordFormatter.cs @@ -25,6 +25,8 @@ namespace AuroraRecordGenerator private IList _securityPublicRecord; private IList _securityRecords; private IList _securityNotes; + private IList _securityAttitudeScc; + private IList _securityAttitudeCrew; private IList _employmentPublicRecord; private IList _employmentExperience; @@ -50,6 +52,8 @@ namespace AuroraRecordGenerator _securityPublicRecord = _targetRecord.SecurityPublicRecord?.LineSplit(); _securityRecords = _targetRecord.SecurityRecords?.LineSplit(); _securityNotes = _targetRecord.SecurityNotes?.LineSplit(); + _securityAttitudeCrew = _targetRecord.SecurityAttitudeCrew?.LineSplit(); + _securityAttitudeScc = _targetRecord.SecurityAttitudeScc?.LineSplit(); // employment _employmentPublicRecord = _targetRecord.EmploymentPublicRecord?.LineSplit(); diff --git a/AuroraRecordGenerator/RecordFormatterGenerationMethods.cs b/AuroraRecordGenerator/RecordFormatterGenerationMethods.cs index 286815d..aba6762 100644 --- a/AuroraRecordGenerator/RecordFormatterGenerationMethods.cs +++ b/AuroraRecordGenerator/RecordFormatterGenerationMethods.cs @@ -10,6 +10,8 @@ namespace AuroraRecordGenerator { var record = new StringBuilder(); record.AppendLine("/// PUBLIC RECORD ///"); + + // TODO: most of this should be replaced by WriteRecordIfAny() if (_targetRecord.FirstName.Any()) { record.AppendLine(MakeNameLine()); @@ -205,7 +207,10 @@ namespace AuroraRecordGenerator recordText.Append(_commonRecords); - if (!_securityRecords.Any() && !_securityNotes.Any()) + if (!_securityRecords.Any() && + !_securityNotes.Any() && + !_securityAttitudeScc.Any() && + !_securityAttitudeCrew.Any()) { recordText.AppendLine("/// NO SECURITY RECORD FOUND ///"); } @@ -214,6 +219,14 @@ namespace AuroraRecordGenerator recordText.AppendLine("/// SECURITY RECORD ///"); recordText.AppendLine(); + WriteSectionIfAny(ref recordText, + "Attitude Towards the SCC:", + _securityAttitudeScc); + + WriteSectionIfAny(ref recordText, + "Attitude Towards the Crew:", + _securityAttitudeCrew); + WriteSectionIfAny(ref recordText, "Notes:", _securityNotes); diff --git a/AuroraRecordGenerator/Types.cs b/AuroraRecordGenerator/Types.cs index 74b194e..503851d 100644 --- a/AuroraRecordGenerator/Types.cs +++ b/AuroraRecordGenerator/Types.cs @@ -90,6 +90,26 @@ namespace AuroraRecordGenerator HumanOffworld } + // Currently unused + [ProtoContract] + public enum ThreatLevel + { + [ProtoEnum] + Minimal = 0, + + [ProtoEnum] + Low, + + [ProtoEnum] + Medium, + + [ProtoEnum] + High, + + [ProtoEnum] + Extreme + } + public static class Info { ///