From c8873ce6b794861584d1b68beb6000295be9607f Mon Sep 17 00:00:00 2001 From: Llywelwyn Date: Thu, 27 Apr 2023 10:00:05 +0100 Subject: [PATCH 1/4] postmortem instructions + minor changes - medical notes are now opt-outs - emphasised titles of must-read sections, like allergies - added postmortem (thanks Lisette, forgot about this) --- CharacterRecordsGenerator/Record.cs | 3 +- CharacterRecordsGenerator/RecordEditor.xaml | 34 ++++++++++++------- CharacterRecordsGenerator/RecordFormatter.cs | 2 ++ .../RecordFormatterGenerationMethods.cs | 25 +++++--------- 4 files changed, 34 insertions(+), 30 deletions(-) diff --git a/CharacterRecordsGenerator/Record.cs b/CharacterRecordsGenerator/Record.cs index 27e1546..65e6df5 100644 --- a/CharacterRecordsGenerator/Record.cs +++ b/CharacterRecordsGenerator/Record.cs @@ -62,7 +62,8 @@ namespace CharacterRecordsGenerator [ProtoMember(18)] public string NextOfKin { get; set; } = string.Empty; - // 19 was used for MedicalPublicRecord, now empty + [ProtoMember(19)] + public string MedicalPostmortem { get; set; } = string.Empty; [ProtoMember(20)] public string MedicalAllergies { get; set; } = string.Empty; diff --git a/CharacterRecordsGenerator/RecordEditor.xaml b/CharacterRecordsGenerator/RecordEditor.xaml index bea0ad4..8dc8368 100644 --- a/CharacterRecordsGenerator/RecordEditor.xaml +++ b/CharacterRecordsGenerator/RecordEditor.xaml @@ -324,60 +324,68 @@ + VerticalAlignment="Top" Margin="5,5,5,0" Text="Postmortem Instructions"/> + VerticalAlignment="Top" Margin="5,5,5,0" Text="Allergies"/> + VerticalAlignment="Top" Margin="5,5,5,0" Text="Current Medications/Prescriptions"/> + VerticalAlignment="Top" Margin="5,5,5,0" Text="Medication History"/> + VerticalAlignment="Top" Margin="5,5,5,0" Text="Surgical History"/> + VerticalAlignment="Top" Margin="5,5,5,0" Text="Physical Evaluations"/> + + + Grid.Row="2" Text="{Binding Path=MedicalAllergies}" TabIndex="6" Grid.ColumnSpan="2" /> diff --git a/CharacterRecordsGenerator/RecordFormatter.cs b/CharacterRecordsGenerator/RecordFormatter.cs index f1f0060..6dbb771 100644 --- a/CharacterRecordsGenerator/RecordFormatter.cs +++ b/CharacterRecordsGenerator/RecordFormatter.cs @@ -17,6 +17,7 @@ namespace CharacterRecordsGenerator private IList _publicNotes; + private IList _MedicalPostmortem; private IList _MedicalAllergies; private IList _MedicalCurrentPrescriptions; private IList _MedicalHistory; @@ -43,6 +44,7 @@ namespace CharacterRecordsGenerator _publicNotes = _targetRecord.PublicNotes?.LineSplit(); // Medical + _MedicalPostmortem = _targetRecord.MedicalPostmortem?.LineSplit(); _MedicalAllergies = _targetRecord.MedicalAllergies?.LineSplit(); _MedicalCurrentPrescriptions = _targetRecord.MedicalCurrentPrescriptions?.LineSplit(); _MedicalHistory = _targetRecord.MedicalHistory?.LineSplit(); diff --git a/CharacterRecordsGenerator/RecordFormatterGenerationMethods.cs b/CharacterRecordsGenerator/RecordFormatterGenerationMethods.cs index 44dc3ec..0791450 100644 --- a/CharacterRecordsGenerator/RecordFormatterGenerationMethods.cs +++ b/CharacterRecordsGenerator/RecordFormatterGenerationMethods.cs @@ -146,6 +146,7 @@ namespace CharacterRecordsGenerator !_MedicalPhysicalEvaluations.Any() && !_MedicalPsychEvaluations.Any() && !_MedicalPsychDisorders.Any() && + !_MedicalPostmortem.Any() && !_targetRecord.NoBorg && !_targetRecord.NoProsthetic && !_targetRecord.NoRevive) @@ -161,44 +162,39 @@ namespace CharacterRecordsGenerator if (_targetRecord.NoBorg || _targetRecord.NoProsthetic || _targetRecord.NoRevive) { - recordText.AppendLine("IMPORTANT NOTES:"); + recordText.AppendLine("OPT-OUTS:"); if (_targetRecord.NoBorg) MakeMedicalNote(ref recordText, "DO NOT BORGIFY"); - if (_targetRecord.NoProsthetic) MakeMedicalNote(ref recordText, "DO NOT INSTALL PROSTHETICS"); - if (_targetRecord.NoRevive) MakeMedicalNote(ref recordText, "DO NOT REVIVE"); recordText.AppendLine(); } + WriteSectionIfAny(ref recordText, + "POSTMORTEM INSTRUCTIONS:", + _MedicalPostmortem); + WriteSectionIfAny(ref recordText, + "ALLERGIES:", + _MedicalAllergies); WriteSectionIfAny(ref recordText, "Current Prescriptions:", _MedicalCurrentPrescriptions); - - WriteSectionIfAny(ref recordText, - "Allergies:", - _MedicalAllergies); - WriteSectionIfAny(ref recordText, "Surgical History:", _MedicalSurgicalHistory); - WriteSectionIfAny(ref recordText, "Medication History:", _MedicalHistory); - WriteSectionIfAny(ref recordText, "Physical Evaluations:", - _MedicalPhysicalEvaluations); - + _MedicalPhysicalEvaluations); WriteSectionIfAny(ref recordText, "Documented Psychological Disorders:", _MedicalPsychDisorders); - WriteSectionIfAny(ref recordText, "Psychological Evaluations:", _MedicalPsychEvaluations); @@ -234,15 +230,12 @@ namespace CharacterRecordsGenerator WriteSectionIfAny(ref recordText, "Attitude Towards the SCC:", _securityAttitudeScc); - WriteSectionIfAny(ref recordText, "Attitude Towards the Crew:", _securityAttitudeCrew); - WriteSectionIfAny(ref recordText, "Notes:", _securityNotes); - WriteSectionIfAny(ref recordText, "Record:", _securityRecords); From 37777424f7b65cf09b48255ce3c984fde8567b8e Mon Sep 17 00:00:00 2001 From: Llywelwyn Date: Thu, 27 Apr 2023 10:03:00 +0100 Subject: [PATCH 2/4] fixes tab indexes --- CharacterRecordsGenerator/RecordEditor.xaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CharacterRecordsGenerator/RecordEditor.xaml b/CharacterRecordsGenerator/RecordEditor.xaml index 8dc8368..f99d9a2 100644 --- a/CharacterRecordsGenerator/RecordEditor.xaml +++ b/CharacterRecordsGenerator/RecordEditor.xaml @@ -344,37 +344,37 @@ controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True" VerticalScrollBarVisibility="Auto" ToolTip="Instructions to execute upon death." Grid.Row="1" - Text="{Binding Path=MedicalPostmortem}" TabIndex="10" Grid.ColumnSpan="2" /> + Text="{Binding Path=MedicalPostmortem}" TabIndex="4" Grid.ColumnSpan="2" /> + Grid.Row="2" Text="{Binding Path=MedicalAllergies}" TabIndex="5" Grid.ColumnSpan="2" /> + Text="{Binding Path=MedicalCurrentPrescriptions}" TabIndex="6" Grid.ColumnSpan="2" /> + Text="{Binding Path=MedicalHistory}" TabIndex="7" Grid.ColumnSpan="2" /> + Text="{Binding Path=MedicalSurgicalHistory}" TabIndex="8" Grid.ColumnSpan="2" /> + Text="{Binding Path=MedicalPhysicalEvaluations}" TabIndex="9" Grid.ColumnSpan="2" /> + Text="{Binding Path=MedicalPsychEvaluations}" TabIndex="11" Grid.ColumnSpan="2" /> From 84fb0686fbf4def4255c2a8825a37616b2b0fef1 Mon Sep 17 00:00:00 2001 From: Llywelwyn Date: Thu, 27 Apr 2023 10:09:03 +0100 Subject: [PATCH 3/4] bumps assemblyver to 2.1.* --- CharacterRecordsGenerator/Properties/AssemblyInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CharacterRecordsGenerator/Properties/AssemblyInfo.cs b/CharacterRecordsGenerator/Properties/AssemblyInfo.cs index ecb6441..1570435 100644 --- a/CharacterRecordsGenerator/Properties/AssemblyInfo.cs +++ b/CharacterRecordsGenerator/Properties/AssemblyInfo.cs @@ -50,5 +50,5 @@ using System.Windows; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.1.*")] +[assembly: AssemblyVersion("2.2.*")] [assembly: AssemblyFileVersion("1.1.0.0")] From 3b5b7d8eb4156222874d5482e95a06e246a75454 Mon Sep 17 00:00:00 2001 From: Llywelwyn Date: Thu, 27 Apr 2023 10:09:03 +0100 Subject: [PATCH 4/4] bumps assemblyver to 2.2.* --- CharacterRecordsGenerator/Properties/AssemblyInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CharacterRecordsGenerator/Properties/AssemblyInfo.cs b/CharacterRecordsGenerator/Properties/AssemblyInfo.cs index ecb6441..1570435 100644 --- a/CharacterRecordsGenerator/Properties/AssemblyInfo.cs +++ b/CharacterRecordsGenerator/Properties/AssemblyInfo.cs @@ -50,5 +50,5 @@ using System.Windows; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.1.*")] +[assembly: AssemblyVersion("2.2.*")] [assembly: AssemblyFileVersion("1.1.0.0")]