Skip to content

Commit

Permalink
fix for not changing taming-food input every time the tab is changed.…
Browse files Browse the repository at this point in the history
… added calculated tranqs for boneDamageAdjusters. numericUpDown-controls have a gray foreground if displaying the value 0 for better recognition. changed behaviour of starving-timer (not needed in the old form). better handling for unknown levels (e.g. oxygen, speed for aquatics) (issue #512). fixed bug regarding OCR-template creation from font-file when characters where wider than 20 px. updated classicFlyers-values.
  • Loading branch information
cadaei committed Jan 30, 2018
1 parent 5203640 commit 6454770
Show file tree
Hide file tree
Showing 16 changed files with 240 additions and 202 deletions.
24 changes: 4 additions & 20 deletions ARKBreedingStats/Form1.Designer.cs

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

14 changes: 6 additions & 8 deletions ARKBreedingStats/Form1.cs
Original file line number Diff line number Diff line change
Expand Up @@ -954,8 +954,8 @@ private void listViewPossibilities_SelectedIndexChanged(object sender, EventArgs

private void setPossibility(int s, int i, bool validateCombination = false)
{
statIOs[s].LevelWild = (Int32)extractor.results[s][i].levelWild;
statIOs[s].LevelDom = (Int32)extractor.results[s][i].levelDom;
statIOs[s].LevelWild = extractor.results[s][i].levelWild;
statIOs[s].LevelDom = extractor.results[s][i].levelDom;
statIOs[s].TamingEffectiveness = (Int32)extractor.results[s][i].TE;
statIOs[s].BreedingValue = breedingValue(s, i);
extractor.chosenResults[s] = i;
Expand Down Expand Up @@ -989,7 +989,6 @@ private void setWildSpeedLevelAccordingToOthers()
{
// if all other stats are unique, set speedlevel
statIOs[6].LevelWild = Math.Max(0, notDeterminedLevels);
statIOs[6].Unknown = false;
}
else
{
Expand All @@ -998,8 +997,7 @@ private void setWildSpeedLevelAccordingToOthers()
{
if (s == 6 || !activeStats[s])
{
statIOs[s].LevelWild = 0;
statIOs[s].Unknown = true;
statIOs[s].LevelWild = -1;
}
}
}
Expand Down Expand Up @@ -1158,7 +1156,7 @@ private void add2Lib(bool fromExtractor = true)
private int[] getCurrentWildLevels(bool fromExtractor = true)
{
int[] levelsWild = new int[8];
for (int s = 0; s < 8; s++) { levelsWild[s] = (fromExtractor ? (statIOs[s].Unknown ? -1 : statIOs[s].LevelWild) : testingIOs[s].LevelWild); }
for (int s = 0; s < 8; s++) { levelsWild[s] = (fromExtractor ? statIOs[s].LevelWild : testingIOs[s].LevelWild); }
return levelsWild;
}

Expand Down Expand Up @@ -2572,7 +2570,7 @@ private List<int>[] findParentSimilarities(List<Creature>[] parents, Creature cr
return parentListSimilarities;
}

//tabcontrolmainchange, tabchange
//tabcontrolmainchange, maintabchange
private void tabControl1_SelectedIndexChanged(object sender, EventArgs e)
{
timerList1.updateTimer = (tabControlMain.SelectedTab == tabPageTimer);
Expand Down Expand Up @@ -2818,7 +2816,7 @@ private void testingStatIOValueUpdate(StatIO sIo)
int torporLvl = 0;
for (int s = 0; s < 7; s++)
{
torporLvl += testingIOs[s].LevelWild;
torporLvl += (testingIOs[s].LevelWild > 0 ? testingIOs[s].LevelWild : 0);
}
testingIOs[7].LevelWild = torporLvl + hiddenLevelsCreatureTester;
}
Expand Down
50 changes: 25 additions & 25 deletions ARKBreedingStats/Form1.resx
Original file line number Diff line number Diff line change
Expand Up @@ -125,31 +125,6 @@ The TE can differ 0.1% due to ingame-rounding.</value>
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="labelErrorHelp.Text" xml:space="preserve">
<value>Extraction failed, common causes:

1. If the creature is bred, check the "Bred Creature"-radiobutton

2. Taming-Effectiveness-Range too narrow, increase the upper and / or decrase the lower bound

3. Typo, double-check the input values

4. Uncheck all Lock-to-Zero-buttons in the stats (all lock-symbols should be green and opened)

5. If the creature has exactly 100% imprinting, check the "Exactly, don't adjust"-checkbox

6. If you have enabled the Singleplayer-Settings in the game, make sure the checkbox is enabled in the settings in this program as well

7. Uncheck the "Consider Wild-level-steps" in the settings.

8. The maximal wild level is set too low, go to the settings and adjust it

9. The multipliers in the Settings (File - Settings) are not set to the multipliers of the server. Ask your admin for the correct multipliers and adjust them in the Settings.

10. The stats of the creature were changed recently and the game displays the old values. Level up a stat, that should trigger a recalculation of the values.

11. The stat-values in this tool are wrong or the game does show wrong stats. You can via reddit or github send me a screenshot that contains the stats of the creature ingame and the extractor with the typed in values along with the stat-multipliers in the settings.</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="radarChart1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
Expand Down Expand Up @@ -232,6 +207,31 @@ The TE can differ 0.1% due to ingame-rounding.</value>
3EnWcIqXZLIQ3XdChGq+ixGgOCJFOf//oGNZTLqel4VLSA4ga5BrcTbyRIRIsQqUtViLEDTXxpd0hLgu
a4ywyrbxQbAB3Ak3qLu41mHMfwCWaqdyEzp1TQAAAABJRU5ErkJggg==
</value>
</data>
<data name="labelErrorHelp.Text" xml:space="preserve">
<value>Extraction failed, common causes:

1. If the creature is bred, check the "Bred Creature"-radiobutton

2. Taming-Effectiveness-Range too narrow, increase the upper and / or decrase the lower bound

3. Typo, double-check the input values

4. Uncheck all Lock-to-Zero-buttons in the stats (all lock-symbols should be green and opened)

5. If the creature has exactly 100% imprinting, check the "Exactly, don't adjust"-checkbox

6. If you have enabled the Singleplayer-Settings in the game, make sure the checkbox is enabled in the settings in this program as well

7. Uncheck the "Consider Wild-level-steps" in the settings.

8. The maximal wild level is set too low, go to the settings and adjust it

9. The multipliers in the Settings (File - Settings) are not set to the multipliers of the server. Ask your admin for the correct multipliers and adjust them in the Settings.

10. The stats of the creature were changed recently and the game displays the old values. Level up a stat, that should trigger a recalculation of the values.

11. The stat-values in this tool are wrong or the game does show wrong stats. You can via reddit or github send me a screenshot that contains the stats of the creature ingame and the extractor with the typed in values along with the stat-multipliers in the settings.</value>
</data>
<data name="radarChartLibrary.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
Expand Down
2 changes: 1 addition & 1 deletion ARKBreedingStats/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
// übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("0.24.8")]
[assembly: AssemblyFileVersion("0.24.9")]
20 changes: 14 additions & 6 deletions ARKBreedingStats/StatIO.Designer.cs

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

Loading

0 comments on commit 6454770

Please sign in to comment.