Update subspecies, minor layout tweaks

This commit is contained in:
Lohikar 2020-02-09 13:04:30 -06:00
parent fcad0979bc
commit 4d234e8550
2 changed files with 30 additions and 9 deletions

View file

@ -98,19 +98,19 @@
Grid.Column="0"
controls:TextBoxHelper.Watermark="Staff (Research, Xenobiology), Command (Research)"
Text="{Binding Path=Clearance}" TabIndex="11" />
<TextBlock HorizontalAlignment="Left" Margin="0,0,0,85"
TextWrapping="Wrap" Text="Employed As" VerticalAlignment="Bottom" Grid.Column="1" />
<TextBox Height="23" Margin="0,0,0,59" TextWrapping="Wrap"
<TextBlock HorizontalAlignment="Left" Margin="5,0,0,85"
TextWrapping="Wrap" Text="Employed As" VerticalAlignment="Bottom" Grid.Column="2" />
<TextBox Height="23" Margin="5,0,10,59" TextWrapping="Wrap"
VerticalAlignment="Bottom" controls:TextBoxHelper.Watermark="Xenobiologist"
Text="{Binding Path=EmployedAs}" HorizontalAlignment="Left" Width="260" Grid.Column="1" TabIndex="10" />
Text="{Binding Path=EmployedAs}" Grid.Column="2" TabIndex="10" />
<TextBox Grid.Column="2" Height="23" Margin="5,73,10.5,0"
TextWrapping="Wrap" VerticalAlignment="Top" controls:TextBoxHelper.Watermark="Sol Alliance"
Text="{Binding Path=Citizenship}" TabIndex="8" />
<TextBlock Grid.Column="2" HorizontalAlignment="Left" Margin="5,57,0,0" TextWrapping="Wrap" Text="Citizenship" VerticalAlignment="Top" />
<ComboBox Grid.Column="0" x:Name="SubSpeciesCombo" Margin="10,120,5,0"
<ComboBox Grid.Column="0" x:Name="SubSpeciesCombo" Margin="10,120,140,0"
VerticalAlignment="Top"
ToolTip="Your character's ethnic group or subtype."
SelectionChanged="SpeciesSelectChanged" Height="26" TabIndex="9"
SelectionChanged="SpeciesSelectChanged" Height="26" TabIndex="9" Grid.ColumnSpan="2"
/>
<TextBlock Grid.Column="0" Margin="10,104,10,0" TextWrapping="Wrap"
Text="Subtype/Ethnicity"

View file

@ -49,11 +49,32 @@ namespace AuroraRecordGenerator
[ProtoEnum, SubspeciesMeta(SpeciesType.Vaurca, "Type B (Warrior)", "Classification")]
VaurcaWarrior,
[ProtoEnum, SubspeciesMeta(SpeciesType.IPC, "Shell Frame", "Subtype")]
[ProtoEnum, SubspeciesMeta(SpeciesType.IPC, "Shell", "Model")]
IpcShell,
[ProtoEnum, SubspeciesMeta(SpeciesType.IPC, "Industrial Frame", "Subtype")]
IpcG1Industrial
[ProtoEnum, SubspeciesMeta(SpeciesType.IPC, "Hephaestus G1 Heavy", "Model")]
IpcG1Industrial,
[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,
[ProtoEnum, SubspeciesMeta(SpeciesType.Unathi, "Aut'akh", "Variant")]
UnathiRobot,
[ProtoEnum, SubspeciesMeta(SpeciesType.Human, "Offworlder", "Variant")]
HumanOffworld
}
[ProtoContract]