whitespace, comments, broad subtypes

- changes some whitespace stuff
- adds some comments for ease of reading

player facing stuff
- adds hharar, njarir to tajara
- adds axiori, xiialt, xiori to skrell
- adds breeders, bulwarks to vaurca
- adds baseline, bishop to ipc models
- renames g1, g2 heavy frames to industrial
- fixes shells being listed twice
- removes 'do not clone' option

AuroraRecordGenerator/Record.cs

@@ -78,9 +78,6 @@ namespace AuroraRecordGenerator
         [ProtoMember(24)]
         public bool NoBorg { get; set; } = false;
 
-		[ProtoMember(25)]
-		public bool NoClone { get; set; } = false;
-
         [ProtoMember(26)]
         public bool NoRevive { get; set; } = false;
 

AuroraRecordGenerator/RecordEditor.xaml

@@ -248,7 +248,7 @@
                 <ScrollViewer>
                     <Grid>
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="60" />
+                            <RowDefinition Height="50" />
                             <!-- Checkboxes -->
                             <RowDefinition Height="122" MinHeight="60" />
                             <RowDefinition Height="122" MinHeight="60" />
@@ -260,21 +260,29 @@
                         </Grid.RowDefinitions>
                         <!-- Opt-Outs -->
                         <Grid Grid.Row="0" ToolTip="If the character wishes to not be cloned.">
-                            <CheckBox x:Name="NoClone" Content="Do Not Clone" HorizontalAlignment="Left"
+                            <Grid.ColumnDefinitions>
-                                      Margin="10,10,0,0" VerticalAlignment="Top" TabIndex="1" />
+                                <ColumnDefinition Width="163*"/>
-                            <CheckBox x:Name="NoProsthetic" Content="No Prosthetics"
+                                <ColumnDefinition Width="163*"/>
-                                      HorizontalAlignment="Left" Margin="10,33,0,0" VerticalAlignment="Top"
+                                <ColumnDefinition Width="163*"/>
-                                      ToolTip="If the character should not be fitted with prosthetics." TabIndex="3" />
+                                <ColumnDefinition Width="163*"/>
-                            <CheckBox x:Name="NoBorg" Content="Do Not Borgify" HorizontalAlignment="Left"
+                                <ColumnDefinition Width="163*"/>
-                                      Margin="136,10,0,0" VerticalAlignment="Top"
+                            </Grid.ColumnDefinitions>
-                                      ToolTip="If the character should not be borged." TabIndex="2" />
+                            <CheckBox x:Name="NoBorg" Content="Do Not Borgify"
+                                      HorizontalAlignment="Left"
+                                      Margin="0,10,0,0"
+                                      ToolTip="If the character should not be borged." TabIndex="1" Grid.Column="0" />
                             <CheckBox x:Name="NoRevive" Content="Do Not Resuscitate"
-                                      HorizontalAlignment="Left" Margin="136,33,0,0" VerticalAlignment="Top"
+                                      HorizontalAlignment="Left"
-                                      ToolTip="If the character should not be revived." TabIndex="4" />
+                                       Margin="-10,10,0,0" 
+                                      ToolTip="If the character should not be revived." TabIndex="2" Grid.Column="1" />
+                            <CheckBox x:Name="NoProsthetic" Content="No Prosthetics"
+                                      HorizontalAlignment="Left"
+                                      Margin="0,10,0,0"
+                                      ToolTip="If the character should not be fitted with prosthetics." TabIndex="3" Grid.Column="2" />
                         </Grid>
                         <!-- user-resizable stuff is fun! Not. -->
                         <GridSplitter Grid.Row="1" Grid.ColumnSpan="1" HorizontalAlignment="Stretch"
-                                      VerticalAlignment="Bottom" Margin="0" Height="10" />
+                                      VerticalAlignment="Bottom" 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"
@@ -286,14 +294,14 @@
                         <GridSplitter Grid.Row="6" Grid.ColumnSpan="1" HorizontalAlignment="Stretch"
                                       VerticalAlignment="Bottom" Margin="0" Height="10" />
 
-                        <TextBox Margin="0,10,0,10" AcceptsReturn="True"
+                        <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,0,10" AcceptsReturn="True" TextWrapping="Wrap"
+                        <TextBox Margin="0,10" AcceptsReturn="True" TextWrapping="Wrap"
                                  controls:TextBoxHelper.Watermark="Medical History"
                                  controls:TextBoxHelper.UseFloatingWatermark="True"
                                  controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"

AuroraRecordGenerator/RecordEditor.xaml.cs

@@ -79,7 +79,6 @@ namespace AuroraRecordGenerator
         private void GenerateRecord(object sender, RoutedEventArgs e)
         {
             // Update medical checkboxes.
-			Data.NoClone = NoClone.IsChecked ?? false;
             Data.NoBorg = NoBorg.IsChecked ?? false;
             Data.NoProsthetic = NoProsthetic.IsChecked ?? false;
             Data.NoRevive = NoRevive.IsChecked ?? false;

AuroraRecordGenerator/RecordFormatterGenerationMethods.cs

@@ -123,7 +123,6 @@ namespace AuroraRecordGenerator
                 !_medicalPsychNotes.Any() &&
                 !_medicalPrescriptions.Any() &&
                 !_targetRecord.NoBorg &&
-				!_targetRecord.NoClone &&
                 !_targetRecord.NoProsthetic &&
                 !_targetRecord.NoRevive)
             {
@@ -137,16 +136,13 @@ namespace AuroraRecordGenerator
                 recordText.AppendLine(
                     " The following information is protected by doctor-patient confidentiality laws. Do not release without patient's consent.\n");
 
-				if (_targetRecord.NoBorg || _targetRecord.NoClone || _targetRecord.NoProsthetic || _targetRecord.NoRevive)
+                if (_targetRecord.NoBorg || _targetRecord.NoProsthetic || _targetRecord.NoRevive)
                 {
                     recordText.AppendLine("IMPORTANT NOTES:");
 
                     if (_targetRecord.NoBorg)
                         MakeMedicalNote(ref recordText, "DO NOT BORGIFY");
 
-					if (_targetRecord.NoClone)
-						MakeMedicalNote(ref recordText, "DO NOT CLONE");
-
                     if (_targetRecord.NoProsthetic)
                         MakeMedicalNote(ref recordText, "DO NOT INSTALL PROSTHETICS");
 

AuroraRecordGenerator/Types.cs

@@ -37,42 +37,55 @@ namespace AuroraRecordGenerator
         [ProtoEnum, SubspeciesMeta(SpeciesType.None, "N/A")]
         None = 0,
 
-		[ProtoEnum, SubspeciesMeta(SpeciesType.Tajara, "M'sai", "Ethnicity")]
+        // SKRELL VARIANTS
-		MsaiTajara,
+        [ProtoEnum, SubspeciesMeta(SpeciesType.Skrell, "Axiori", "Ethnicity")]
+        SkrellAxiori,
+        [ProtoEnum, SubspeciesMeta(SpeciesType.Skrell, "Xiialt", "Ethnicity")]
+        SkrellXiialt,
+        [ProtoEnum, SubspeciesMeta(SpeciesType.Skrell, "Xiiori", "Ethnicity")]
+        SkrellXiiori,
 
+        // TAJARA VARIANTS
+        [ProtoEnum, SubspeciesMeta(SpeciesType.Tajara, "Hharar", "Ethnicity")]
+        TajaraHharar,
         [ProtoEnum, SubspeciesMeta(SpeciesType.Tajara, "Zhan-Khazan", "Ethnicity")]
-		ZhanTajara,
+        TajaraZhan,
+        [ProtoEnum, SubspeciesMeta(SpeciesType.Tajara, "Njarir'Akhran", "Ethnicity")]
+        TajaraNjarir,
+        [ProtoEnum, SubspeciesMeta(SpeciesType.Tajara, "M'sai", "Ethnicity")]
+        TajaraMsai,
 
+        // VAURCA VARIANTS
         [ProtoEnum, SubspeciesMeta(SpeciesType.Vaurca, "Type A (Worker)", "Classification")]
         VaurcaWorker,
-
         [ProtoEnum, SubspeciesMeta(SpeciesType.Vaurca, "Type B (Warrior)", "Classification")]
         VaurcaWarrior,
+        [ProtoEnum, SubspeciesMeta(SpeciesType.Vaurca, "Type C (Breeder)", "Classification")]
+        VaurcaBreeder,
+        [ProtoEnum, SubspeciesMeta(SpeciesType.Vaurca, "Type E (Bulwark)", "Classification")]
+        VaurcaBulwark,
 
+        // IPC VARIANTS
+        [ProtoEnum, SubspeciesMeta(SpeciesType.IPC, "Baseline", "Model")]
+        IpcBaseline,
         [ProtoEnum, SubspeciesMeta(SpeciesType.IPC, "Shell", "Model")]
         IpcShell,
-
+        [ProtoEnum, SubspeciesMeta(SpeciesType.IPC, "Hephaestus G1 Industrial", "Model")]
-		[ProtoEnum, SubspeciesMeta(SpeciesType.IPC, "Hephaestus G1 Heavy", "Model")]
+        IpcG1,
-		IpcG1Industrial,
+        [ProtoEnum, SubspeciesMeta(SpeciesType.IPC, "Hephaestus G2 Industrial", "Model")]
-
+        IpcG2,
-        [ProtoEnum, SubspeciesMeta(SpeciesType.IPC, "Hephaestus G2 Heavy", "Model")]
-        IpcG2Industrial,
-
-        [ProtoEnum, SubspeciesMeta(SpeciesType.IPC, "Bishop Accessory", "Model")]
-        IpcFancy,
-
-        [ProtoEnum, SubspeciesMeta(SpeciesType.IPC, "Zeng-Hu Mobility", "Model")]
-        IpcMedsci,
-
-        [ProtoEnum, SubspeciesMeta(SpeciesType.IPC, "Shell", "Model")]
-        IpcHumanoid,
-
         [ProtoEnum, SubspeciesMeta(SpeciesType.IPC, "Xion Industrial", "Model")]
-        IpcHeavy,
+        IpcXion,
+        [ProtoEnum, SubspeciesMeta(SpeciesType.IPC, "Zeng-Hu Mobility", "Model")]
+        IpcZengHu,
+        [ProtoEnum, SubspeciesMeta(SpeciesType.IPC, "Bishop Accessory", "Model")]
+        IpcBishop,
 
+        // UNATHI VARIANTS
         [ProtoEnum, SubspeciesMeta(SpeciesType.Unathi, "Aut'akh", "Variant")]
-        UnathiRobot,
+        UnathiAutakh,
 
+        // HUMAN VARIANTS
         [ProtoEnum, SubspeciesMeta(SpeciesType.Human, "Offworlder", "Variant")]
         HumanOffworld
     }
@@ -103,7 +116,7 @@ namespace AuroraRecordGenerator
     [AttributeUsage(AttributeTargets.Field)]
     public class SubspeciesMetaAttribute : Attribute
     {
-		public SpeciesType AssociatedSpecies {get; private set;}
+        public SpeciesType AssociatedSpecies { get; private set; }
         public string NiceName { get; private set; }
         public string FieldName { get; private set; }
         public SubspeciesMetaAttribute(SpeciesType associatedType, string nicename, string fieldname = "Subspecies")