reworked public info
- removed employment, medical, security public notes - added public notes section +1 assemblyver because back compat is broken now
This commit is contained in:
Llywelwyn
parent
1d0c9a3abd
commit
d5101ab206
5 changed files with 54 additions and 71 deletions
|
|
@ -49,5 +49,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("1.4.*")]
|
||||
[assembly: AssemblyVersion("2.0.*")]
|
||||
[assembly: AssemblyFileVersion("1.1.0.0")]
|
||||
|
|
|
|||
|
|
@ -22,8 +22,6 @@ namespace AuroraRecordGenerator
|
|||
[ProtoMember(5)]
|
||||
public SpeciesType Species { get; set; } = SpeciesType.Human;
|
||||
|
||||
[ProtoMember(16)]
|
||||
public SpeciesSubType Subspecies { get; set; } = SpeciesSubType.None;
|
||||
|
||||
[ProtoMember(6)]
|
||||
public string Pronouns { get; set; } = string.Empty;
|
||||
|
|
@ -55,13 +53,16 @@ namespace AuroraRecordGenerator
|
|||
[ProtoMember(15)]
|
||||
public string Citizenship { get; set; } = string.Empty;
|
||||
|
||||
// 16 & 17 used to be PictureUrl and PictureCredit, now unused.
|
||||
[ProtoMember(16)]
|
||||
public SpeciesSubType Subspecies { get; set; } = SpeciesSubType.None;
|
||||
|
||||
[ProtoMember(17)]
|
||||
public string PublicNotes { get; set; } = string.Empty;
|
||||
|
||||
[ProtoMember(18)]
|
||||
public string NextOfKin { get; set; } = string.Empty;
|
||||
|
||||
[ProtoMember(19)]
|
||||
public string MedicalPublicRecord { get; set; } = string.Empty;
|
||||
// 19 was used for MedicalPublicRecord, now empty
|
||||
|
||||
[ProtoMember(20)]
|
||||
public string MedicalHistory { get; set; } = string.Empty;
|
||||
|
|
@ -89,8 +90,7 @@ namespace AuroraRecordGenerator
|
|||
[ProtoMember(28)]
|
||||
public string MedicalPrescriptions { get; set; } = string.Empty;
|
||||
|
||||
[ProtoMember(29)]
|
||||
public string SecurityPublicRecord { get; set; } = string.Empty;
|
||||
// 29 was used for SecurityPublicRecord, now empty
|
||||
|
||||
[ProtoMember(30)]
|
||||
public string SecurityRecords { get; set; } = string.Empty;
|
||||
|
|
@ -98,8 +98,7 @@ namespace AuroraRecordGenerator
|
|||
[ProtoMember(31)]
|
||||
public string SecurityNotes { get; set; } = string.Empty;
|
||||
|
||||
[ProtoMember(32)]
|
||||
public string EmploymentPublicRecord { get; set; } = string.Empty;
|
||||
// 32 was used for EmploymentPublicRecord, now empty
|
||||
|
||||
[ProtoMember(33)]
|
||||
public string EmploymentExperience { get; set; } = string.Empty;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
xmlns:system="clr-namespace:System;assembly=mscorlib"
|
||||
xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
|
||||
mc:Ignorable="d"
|
||||
Title="Aurora Character Records Generator" Height="563" Width="719.583"
|
||||
Title="Aurora Character Records Generator, 2464 edition" Height="697" Width="719.583"
|
||||
GlowBrush="{DynamicResource AccentColorBrush}"
|
||||
TitleCharacterCasing="Normal" Loaded="WindowLoaded">
|
||||
<controls:MetroWindow.Resources>
|
||||
|
|
@ -24,7 +24,11 @@
|
|||
</ObjectDataProvider>
|
||||
</controls:MetroWindow.Resources>
|
||||
<Grid>
|
||||
<controls:MetroAnimatedTabControl Margin="10,10,0,45" controls:TabControlHelper.IsUnderlined="True">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="85*"/>
|
||||
<ColumnDefinition Width="93*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<controls:MetroAnimatedTabControl Margin="10,10,0,45" controls:TabControlHelper.IsUnderlined="True" Grid.ColumnSpan="2">
|
||||
<!-- General Character Information -->
|
||||
<TabItem Header="General">
|
||||
<ScrollViewer>
|
||||
|
|
@ -180,6 +184,29 @@
|
|||
Text="Eye Color" VerticalAlignment="Top" />
|
||||
</Grid>
|
||||
</GroupBox>
|
||||
<GroupBox Header="Additional Information" controls:ControlsHelper.ContentCharacterCasing="Normal"
|
||||
Height="160">
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="122"
|
||||
MinHeight="60"/>
|
||||
</Grid.RowDefinitions>
|
||||
<GridSplitter Grid.Row="0"
|
||||
HorizontalAlignment="Stretch"
|
||||
VerticalAlignment="Bottom"
|
||||
Margin="0"
|
||||
Height="10" />
|
||||
<TextBox Grid.Row="0"
|
||||
Margin="0,10,0,10"
|
||||
AcceptsReturn="True"
|
||||
TextWrapping="Wrap"
|
||||
VerticalScrollBarVisibility="Auto"
|
||||
controls:TextBoxHelper.Watermark="Any additional notes that should be present on all three records.

e.g.
John Doe is here for a two-month cultural exchange.
John Doe has been known to [...]."
|
||||
ToolTip="Additional public notes that will be visible on all three records."
|
||||
Text="{Binding Path=PublicNotes}"
|
||||
d:LayoutOverrides="VerticalAlignment"/>
|
||||
</Grid>
|
||||
</GroupBox>
|
||||
</StackPanel>
|
||||
</ScrollViewer>
|
||||
</TabItem>
|
||||
|
|
@ -191,7 +218,6 @@
|
|||
<RowDefinition Height="122" MinHeight="60" />
|
||||
<RowDefinition Height="122" MinHeight="60" />
|
||||
<RowDefinition Height="122" MinHeight="60" />
|
||||
<RowDefinition Height="122" MinHeight="60" />
|
||||
</Grid.RowDefinitions>
|
||||
<GridSplitter Grid.Row="0" Grid.ColumnSpan="1" HorizontalAlignment="Stretch"
|
||||
VerticalAlignment="Bottom" Margin="0" Height="10" />
|
||||
|
|
@ -199,27 +225,14 @@
|
|||
VerticalAlignment="Bottom" Margin="0" Height="10" />
|
||||
<GridSplitter Grid.Row="2" Grid.ColumnSpan="1" HorizontalAlignment="Stretch"
|
||||
VerticalAlignment="Bottom" Margin="0" Height="10" />
|
||||
<GridSplitter Grid.Row="3" Grid.ColumnSpan="1" HorizontalAlignment="Stretch"
|
||||
VerticalAlignment="Bottom" Margin="0" Height="10" />
|
||||
<GridSplitter Grid.Row="4" Grid.ColumnSpan="1" HorizontalAlignment="Stretch"
|
||||
VerticalAlignment="Bottom" Margin="0" Height="10" />
|
||||
<GridSplitter Grid.Row="5" Grid.ColumnSpan="1" HorizontalAlignment="Stretch"
|
||||
VerticalAlignment="Bottom" Margin="0" Height="10" />
|
||||
<TextBox Margin="0,10,0,10" AcceptsReturn="True"
|
||||
TextWrapping="Wrap"
|
||||
controls:TextBoxHelper.Watermark="Public Record"
|
||||
controls:TextBoxHelper.UseFloatingWatermark="True" VerticalScrollBarVisibility="Auto"
|
||||
controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True" Grid.Row="0"
|
||||
ToolTip="Public employment notes posted on security and medical records. One per line."
|
||||
d:LayoutOverrides="VerticalAlignment" Text="{Binding Path=EmploymentPublicRecord}" />
|
||||
<TextBox Margin="0,10,0,10" AcceptsReturn="True"
|
||||
TextWrapping="Wrap" controls:TextBoxHelper.Watermark="Employment History"
|
||||
controls:TextBoxHelper.UseFloatingWatermark="True" VerticalScrollBarVisibility="Auto"
|
||||
controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True" Grid.Row="1"
|
||||
controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True" Grid.Row="0"
|
||||
ToolTip="Previous jobs that the character has worked. One per line.
No need to put hyphens/bulletpoints; they'll be added automatically.

e.g.
Police Cadet, Mendell City [2450 - 2454]
Police Officer, Mendell City [2454 - Ongoing]"
|
||||
d:LayoutOverrides="VerticalAlignment" Text="{Binding Path=EmploymentExperience}" />
|
||||
<TextBox Margin="0,10,0,10" AcceptsReturn="True"
|
||||
TextWrapping="Wrap" Grid.Row="2"
|
||||
TextWrapping="Wrap" Grid.Row="1"
|
||||
controls:TextBoxHelper.Watermark="Formal Education / Qualifications"
|
||||
controls:TextBoxHelper.UseFloatingWatermark="True" VerticalScrollBarVisibility="Auto"
|
||||
controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
|
||||
|
|
@ -227,7 +240,7 @@
|
|||
Text="{Binding Path=EmploymentFormalEducation}" />
|
||||
<TextBox Margin="0,10,0,10" AcceptsReturn="True"
|
||||
TextWrapping="Wrap"
|
||||
controls:TextBoxHelper.Watermark="Other Skills / Ongoing Training" Grid.Row="3"
|
||||
controls:TextBoxHelper.Watermark="Other Skills / Ongoing Training" Grid.Row="2"
|
||||
controls:TextBoxHelper.UseFloatingWatermark="True" VerticalScrollBarVisibility="Auto"
|
||||
controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
|
||||
Text="{Binding Path=EmploymentSkills}"
|
||||
|
|
@ -283,50 +296,40 @@
|
|||
VerticalAlignment="Bottom" Margin="0" Height="10" />
|
||||
<GridSplitter Grid.Row="5" Grid.ColumnSpan="1" HorizontalAlignment="Stretch"
|
||||
VerticalAlignment="Bottom" Margin="0" Height="10" />
|
||||
<GridSplitter Grid.Row="6" Grid.ColumnSpan="1" HorizontalAlignment="Stretch"
|
||||
VerticalAlignment="Bottom" Margin="0" Height="10" />
|
||||
|
||||
<TextBox Margin="0,10" AcceptsReturn="True"
|
||||
TextWrapping="Wrap" controls:TextBoxHelper.Watermark="Public Record"
|
||||
controls:TextBoxHelper.UseFloatingWatermark="True"
|
||||
controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
|
||||
ToolTip="Public medical notes posted on employment and security records. One per line."
|
||||
Grid.Row="1" VerticalScrollBarVisibility="Auto"
|
||||
Text="{Binding Path=MedicalPublicRecord}" TabIndex="5" />
|
||||
<TextBox Margin="0,10" AcceptsReturn="True" TextWrapping="Wrap"
|
||||
controls:TextBoxHelper.Watermark="Medical History"
|
||||
controls:TextBoxHelper.UseFloatingWatermark="True"
|
||||
controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
|
||||
VerticalScrollBarVisibility="Auto"
|
||||
ToolTip="Dated list of operations, surgeries, checkups of note, etc. One per line."
|
||||
Grid.Row="2" Text="{Binding Path=MedicalHistory}" TabIndex="6" />
|
||||
Grid.Row="1" Text="{Binding Path=MedicalHistory}" TabIndex="6" />
|
||||
<TextBox Margin="0,10,0,10" AcceptsReturn="True" TextWrapping="Wrap"
|
||||
controls:TextBoxHelper.Watermark="Medical Notes - prescriptions, allergies, etc."
|
||||
controls:TextBoxHelper.UseFloatingWatermark="True"
|
||||
controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
|
||||
VerticalScrollBarVisibility="Auto"
|
||||
ToolTip="Current prescriptions, allergies, etc. One per line." Grid.Row="3"
|
||||
ToolTip="Current prescriptions, allergies, etc. One per line." Grid.Row="2"
|
||||
Text="{Binding Path=MedicalNotes}" TabIndex="7" />
|
||||
<TextBox Margin="0,10,0,10" AcceptsReturn="True"
|
||||
TextWrapping="Wrap" controls:TextBoxHelper.Watermark="Psychiatric History"
|
||||
controls:TextBoxHelper.UseFloatingWatermark="True"
|
||||
controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
|
||||
VerticalScrollBarVisibility="Auto"
|
||||
ToolTip="Dated records of psych evals and other psychological events." Grid.Row="4"
|
||||
ToolTip="Dated records of psych evals and other psychological events." Grid.Row="3"
|
||||
Text="{Binding Path=MedicalPsychHistory}" TabIndex="8" />
|
||||
<TextBox Margin="0,10,0,10" AcceptsReturn="True"
|
||||
TextWrapping="Wrap" controls:TextBoxHelper.Watermark="Psychiatric Notes"
|
||||
controls:TextBoxHelper.UseFloatingWatermark="True"
|
||||
controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
|
||||
VerticalScrollBarVisibility="Auto"
|
||||
ToolTip="Notes about mental/psychiatric health. One per line." Grid.Row="5"
|
||||
ToolTip="Notes about mental/psychiatric health. One per line." Grid.Row="4"
|
||||
Text="{Binding Path=MedicalPsychNotes}" TabIndex="9" />
|
||||
<TextBox Margin="0,10,0,10" AcceptsReturn="True"
|
||||
TextWrapping="Wrap" controls:TextBoxHelper.Watermark="Prescriptions"
|
||||
controls:TextBoxHelper.UseFloatingWatermark="True"
|
||||
controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
|
||||
VerticalScrollBarVisibility="Auto"
|
||||
ToolTip="Notes regarding assigned prescriptions. One per line." Grid.Row="6"
|
||||
ToolTip="Notes regarding assigned prescriptions. One per line." Grid.Row="5"
|
||||
Text="{Binding Path=MedicalPrescriptions}" TabIndex="10" />
|
||||
</Grid>
|
||||
</ScrollViewer>
|
||||
|
|
@ -339,7 +342,6 @@
|
|||
<RowDefinition Height="122" MinHeight="60" />
|
||||
<RowDefinition Height="122" MinHeight="60" />
|
||||
<RowDefinition Height="122" MinHeight="60" />
|
||||
<RowDefinition Height="122" MinHeight="60" />
|
||||
<RowDefinition Height="0" />
|
||||
</Grid.RowDefinitions>
|
||||
<Grid Grid.Row="0">
|
||||
|
|
@ -367,30 +369,24 @@
|
|||
VerticalAlignment="Bottom" Margin="0" Height="10" />
|
||||
<GridSplitter Grid.Row="2" Grid.ColumnSpan="1" HorizontalAlignment="Stretch"
|
||||
VerticalAlignment="Bottom" Margin="0" Height="10" />
|
||||
<TextBox Grid.Row="1" Margin="0,10,0,10" AcceptsReturn="True"
|
||||
TextWrapping="Wrap" controls:TextBoxHelper.Watermark="Public Record"
|
||||
controls:TextBoxHelper.UseFloatingWatermark="True" VerticalScrollBarVisibility="Auto"
|
||||
controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
|
||||
ToolTip="Public security notes added to employment and medical records. One per line."
|
||||
Text="{Binding Path=SecurityPublicRecord}" />
|
||||
<TextBox Margin="0,10,0,10" AcceptsReturn="True"
|
||||
TextWrapping="Wrap" controls:TextBoxHelper.Watermark="Arrest History"
|
||||
controls:TextBoxHelper.UseFloatingWatermark="True" VerticalScrollBarVisibility="Auto"
|
||||
controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
|
||||
ToolTip="List of charges, dated if possible. One per line." Grid.Row="2"
|
||||
ToolTip="List of charges, dated if possible. One per line." Grid.Row="1"
|
||||
Text="{Binding Path=SecurityRecords}" />
|
||||
<TextBox Margin="0,10,0,10" AcceptsReturn="True"
|
||||
TextWrapping="Wrap" controls:TextBoxHelper.Watermark="Other notes"
|
||||
controls:TextBoxHelper.UseFloatingWatermark="True" VerticalScrollBarVisibility="Auto"
|
||||
controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
|
||||
ToolTip="Any things security should keep in mind when dealing with you. One per line."
|
||||
Grid.Row="3" Text="{Binding Path=SecurityNotes}" />
|
||||
Grid.Row="2" Text="{Binding Path=SecurityNotes}" />
|
||||
</Grid>
|
||||
</ScrollViewer>
|
||||
</TabItem>
|
||||
</controls:MetroAnimatedTabControl>
|
||||
<!-- Footer -->
|
||||
<Grid Height="45" VerticalAlignment="Bottom">
|
||||
<Grid Height="45" VerticalAlignment="Bottom" Grid.ColumnSpan="2">
|
||||
<Button Content="Open" HorizontalAlignment="Left" Margin="10,9.66,0,10" Width="75"
|
||||
d:LayoutOverrides="Height" Click="OpenContent" />
|
||||
<Button Content="Save" HorizontalAlignment="Left" Margin="90,10,0,9.66" Width="75"
|
||||
|
|
|
|||
|
|
@ -15,20 +15,19 @@ namespace AuroraRecordGenerator
|
|||
MakeCommonRecords();
|
||||
}
|
||||
|
||||
private IList<string> _medicalPublicRecord;
|
||||
private IList<string> _publicNotes;
|
||||
|
||||
private IList<string> _medicalHistory;
|
||||
private IList<string> _medicalNotes;
|
||||
private IList<string> _medicalPsychHistory;
|
||||
private IList<string> _medicalPsychNotes;
|
||||
private IList<string> _medicalPrescriptions;
|
||||
|
||||
private IList<string> _securityPublicRecord;
|
||||
private IList<string> _securityRecords;
|
||||
private IList<string> _securityNotes;
|
||||
private IList<string> _securityAttitudeScc;
|
||||
private IList<string> _securityAttitudeCrew;
|
||||
|
||||
private IList<string> _employmentPublicRecord;
|
||||
private IList<string> _employmentExperience;
|
||||
private IList<string> _employmentFormalEducation;
|
||||
private IList<string> _employmentSkills;
|
||||
|
|
@ -39,9 +38,9 @@ namespace AuroraRecordGenerator
|
|||
{
|
||||
_targetRecord = new Record();
|
||||
}
|
||||
_publicNotes = _targetRecord.PublicNotes?.LineSplit();
|
||||
|
||||
// Medical
|
||||
_medicalPublicRecord = _targetRecord.MedicalPublicRecord?.LineSplit();
|
||||
_medicalHistory = _targetRecord.MedicalHistory?.LineSplit();
|
||||
_medicalNotes = _targetRecord.MedicalNotes?.LineSplit();
|
||||
_medicalPsychHistory = _targetRecord.MedicalPsychHistory?.LineSplit();
|
||||
|
|
@ -49,14 +48,12 @@ namespace AuroraRecordGenerator
|
|||
_medicalPrescriptions = _targetRecord.MedicalPrescriptions?.LineSplit();
|
||||
|
||||
// security
|
||||
_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();
|
||||
_employmentExperience = _targetRecord.EmploymentExperience?.LineSplit();
|
||||
_employmentFormalEducation = _targetRecord.EmploymentFormalEducation?.LineSplit();
|
||||
_employmentSkills = _targetRecord.EmploymentSkills?.LineSplit();
|
||||
|
|
|
|||
|
|
@ -81,16 +81,8 @@ namespace AuroraRecordGenerator
|
|||
|
||||
// general notes
|
||||
WriteSectionIfAny(ref record,
|
||||
"Shared Employment Notes:",
|
||||
_employmentPublicRecord);
|
||||
|
||||
WriteSectionIfAny(ref record,
|
||||
"Shared Medical Notes:",
|
||||
_medicalPublicRecord);
|
||||
|
||||
WriteSectionIfAny(ref record,
|
||||
"Shared Security Notes:",
|
||||
_securityPublicRecord);
|
||||
"Additional Notes:",
|
||||
_publicNotes);
|
||||
|
||||
_commonRecords = record.ToString();
|
||||
}
|
||||
|
|
@ -105,7 +97,6 @@ namespace AuroraRecordGenerator
|
|||
|
||||
if (!_employmentExperience.Any() &&
|
||||
!_employmentFormalEducation.Any() &&
|
||||
!_employmentPublicRecord.Any() &&
|
||||
!_employmentSkills.Any())
|
||||
{
|
||||
recordText.AppendLine("/// NO EMPLOYMENT RECORD FOUND ///");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue