Skip to content

Commit

Permalink
fixed tab-order in creatureInfoInput. fix for top-stat being 0 (cause…
Browse files Browse the repository at this point in the history
…d trouble in the breeding-planner). updated classicFlyers-values so they should only needed to be updated after a classic flyers update. improvement of the ark-tools-import if placeholder parents were already imported and then the real parents are imported. importExported now displays if a creature was already imported (only works with creatures that got imported from now due to a guid-bug). added possible level-range to raising-tab when clicking on an egg-timer. improved performance when having speech-recognition enabled and a high wildLevelMax.
  • Loading branch information
cadaei committed Apr 2, 2018
1 parent 011dfef commit 3bde264
Show file tree
Hide file tree
Showing 29 changed files with 816 additions and 169 deletions.
11 changes: 11 additions & 0 deletions ARKBreedingStats/ARKBreedingStats.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,13 @@
</Compile>
<Compile Include="ImportExported.cs" />
<Compile Include="miscClasses\IssueNotes.cs" />
<Compile Include="settings\ATImportFileLocation.cs" />
<Compile Include="settings\ATImportFileLocationDialog.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="settings\ATImportFileLocationDialog.Designer.cs">
<DependentUpon>ATImportFileLocationDialog.cs</DependentUpon>
</Compile>
<Compile Include="species\CreatureColors.cs" />
<Compile Include="testCases\ExtractionTestCase.cs" />
<Compile Include="Importer.cs" />
Expand Down Expand Up @@ -409,6 +416,9 @@
<EmbeddedResource Include="raising\ParentStatValues.resx">
<DependentUpon>ParentStatValues.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="settings\ATImportFileLocationDialog.resx">
<DependentUpon>ATImportFileLocationDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="settings\customSoundChooser.resx">
<DependentUpon>customSoundChooser.cs</DependentUpon>
</EmbeddedResource>
Expand Down Expand Up @@ -499,6 +509,7 @@
<Content Include="Resources\lock.png" />
<Content Include="Resources\newPlayer.png" />
<Content Include="Resources\newTribe.png" />
<Content Include="Resources\open.gif" />
<Content Include="Resources\settings.png" />
<Content Include="Resources\unlocked.png" />
<Content Include="ver.txt" />
Expand Down
3 changes: 2 additions & 1 deletion ARKBreedingStats/Creature.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class Creature : IEquatable<Creature>
{
public string species;
public string name;
public Sex gender;
public Sex gender; // remove on 07/2018
public Sex sex;
public CreatureStatus status;
// order of the stats is Health, Stamina, Oxygen, Food, Weight, MeleeDamage, Speed, Torpor
Expand Down Expand Up @@ -56,6 +56,7 @@ public class Creature : IEquatable<Creature>
public DateTime growingUntil = new DateTime(0);
public DateTime cooldownUntil = new DateTime(0);
public DateTime domesticatedAt = new DateTime(0);
public DateTime addedToLibrary = new DateTime(0);
public bool neutered = false;
public int mutationCounter; // remove this field on 07-2018
public int mutationsMaternal;
Expand Down
2 changes: 1 addition & 1 deletion ARKBreedingStats/CreatureCollection.cs
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public bool mergeCreatureList(List<Creature> creaturesToMerge, bool update = fal
old.domesticatedAt = creature.domesticatedAt;
old.fatherGuid = creature.fatherGuid;
old.fatherName = creature.fatherName;
old.gender = creature.gender;
old.sex = creature.sex;
old.generation = creature.generation;
old.growingUntil = creature.growingUntil;
old.imprinterName = creature.imprinterName;
Expand Down
72 changes: 36 additions & 36 deletions ARKBreedingStats/CreatureInfoInput.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions ARKBreedingStats/ExportedCreatureList.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ namespace ARKBreedingStats
public partial class ExportedCreatureList : Form
{
public event ExportedCreatureControl.CopyValuesToExtractorEventHandler CopyValuesToExtractor;
public event ExportedCreatureControl.CheckGuidInLibraryEventHandler CheckGuidInLibrary;
public delegate void ReadyForCreatureUpdatesEventHandler();
public event ReadyForCreatureUpdatesEventHandler ReadyForCreatureUpdates;

Expand Down Expand Up @@ -57,6 +58,8 @@ private void addCreatureValuesControl(CreatureValues cv)
ExportedCreatureControl ecc = new ExportedCreatureControl(cv);
ecc.Dock = DockStyle.Top;
ecc.CopyValuesToExtractor += CopyValuesToExtractor;
ecc.CheckGuidInLibrary += CheckGuidInLibrary;
ecc.DoCheckGuidInLibrary();
panel1.Controls.Add(ecc);
}

Expand Down
9 changes: 4 additions & 5 deletions ARKBreedingStats/Form1.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 3bde264

Please sign in to comment.