Skip to content

Commit

Permalink
added note for scorpion and procoptodon that their stats are displaye…
Browse files Browse the repository at this point in the history
…d wrong after taming. added check for SpeechRecognition-library (for Mono). fix if no color-region-information is given for a species.
  • Loading branch information
cadaei committed Jul 16, 2017
1 parent e0e7c99 commit 69bb8d5
Show file tree
Hide file tree
Showing 10 changed files with 44 additions and 18 deletions.
9 changes: 5 additions & 4 deletions ARKBreedingStats/Form1.Designer.cs

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

28 changes: 22 additions & 6 deletions ARKBreedingStats/Form1.cs
Original file line number Diff line number Diff line change
Expand Up @@ -288,13 +288,20 @@ private void Form1_Load(object sender, EventArgs e)
ocrControl1.loadOCRTemplate(Properties.Settings.Default.ocrFile);

// initialize speech recognition if enabled
bool labelListeningVisible = false;
if (Properties.Settings.Default.SpeechRecognition)
{
speechRecognition = new SpeechRecognition(300, labelListening);
speechRecognition.speechRecognized += new SpeechRecognition.SpeechRecognizedEventHandler(tellTamingData);
speechRecognition.speechCommandRecognized += new SpeechRecognition.SpeechCommandRecognizedEventHandler(speechCommand);
var speechRecognitionAvailable = (AppDomain.CurrentDomain.GetAssemblies().Any(a => a.FullName.Substring(0, 13) == "System.Speech"));

if (speechRecognitionAvailable)
{
labelListeningVisible = true;
speechRecognition = new SpeechRecognition(300, labelListening);
speechRecognition.speechRecognized += new SpeechRecognition.SpeechRecognizedEventHandler(tellTamingData);
speechRecognition.speechCommandRecognized += new SpeechRecognition.SpeechCommandRecognizedEventHandler(speechCommand);
}
}
else labelListening.Visible = false;
else labelListening.Visible = labelListeningVisible;

clearAll();
// UI loaded
Expand Down Expand Up @@ -606,7 +613,16 @@ private void extractionFailed()
groupBoxRadarChartExtractor.Visible = false;
labelDoc.Visible = false;
if (radioButtonBred.Checked && numericUpDownImprintingBonusExtractor.Value > 0)
{
labelImprintingFailInfo.Text = "If the creature is imprinted the extraction may fail because the game sometimes \"forgets\" to increase some stat-values during the imprinting-process. Usually it works after a server-restart.";
labelImprintingFailInfo.Visible = true;
}
else if (radioButtonTamed.Checked && "Procoptodon,Pulmonoscorpius".Split(',').ToList().IndexOf(comboBoxSpeciesGlobal.SelectedItem.ToString()) >= 0)
{
// creatures that display wrong stat-values after taming
labelImprintingFailInfo.Text = "The " + comboBoxSpeciesGlobal.SelectedItem.ToString() + " is known for displaying wrong stat-values after taming. Please try the extraction again after the server restarted.";
labelImprintingFailInfo.Visible = true;
}
toolStripButtonSaveCreatureValuesTemp.Visible = true;
}

Expand Down Expand Up @@ -724,8 +740,8 @@ private void updateExtrDetails()
panelExtrTE.Visible = radioButtonTamed.Checked;
panelExtrImpr.Visible = radioButtonBred.Checked;
groupBoxDetailsExtractor.Visible = !radioButtonWild.Checked;
checkBoxJustTamed.Checked = checkBoxJustTamed.Checked && radioButtonTamed.Checked;
checkBoxJustTamed.Visible = radioButtonTamed.Checked;
//checkBoxJustTamed.Checked = checkBoxJustTamed.Checked && radioButtonTamed.Checked; // TODO remove if bug ingame is resolved
//checkBoxJustTamed.Visible = radioButtonTamed.Checked;
cbEventMultipliers.Visible = radioButtonBred.Checked;
if (radioButtonTamed.Checked)
groupBoxDetailsExtractor.Text = "Taming-Effectiveness";
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.23.10")]
[assembly: AssemblyFileVersion("0.23.11")]
2 changes: 1 addition & 1 deletion ARKBreedingStats/Values.cs
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,8 @@ public bool loadAdditionalValues(string filename, bool showResults)
}
}
}
if (updated) speciesUpdated++;
}
if (updated) speciesUpdated++;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ARKBreedingStats/json/classicFlyers.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"ver":"1.0.0","species":[{"name":"Argentavis","statsRaw":[null,[750,0.1,0.1],null,null,[350,0.02,0.04,0,0],null,[null,null,0.025],null],"NoImprintingForSpeed":false},{"name":"Lymantria","statsRaw":[null,[180,0.1,0.1],null,null,null,null,[null,null,0.025],null]},{"name":"Pelagornis","statsRaw":[[210,0.2,0.27,0.5,0],[320,0.1,0.1],null,null,[135,0.02,0.04,0,0],null,[null,null,0.025],null],"TamedBaseHealthMultiplier":1,"NoImprintingForSpeed":false},{"name":"Pteranodon","statsRaw":[[210,0.2,0.27,0.5,0],[300,0.1,0.1],null,null,[150,0.02,0.04,0,0],null,[null,null,0.02],null],"TamedBaseHealthMultiplier":1,"NoImprintingForSpeed":false},{"name":"Quetzal","statsRaw":[[1200,0.2,0.27,0.5,0],[750,0.1,0.1],null,null,[780,0.02,0.04,0,0],null,[null,null,0.025],null],"TamedBaseHealthMultiplier":1,"NoImprintingForSpeed":false},{"name":"Tapejara","statsRaw":[null,[450,0.1,0.1],null,null,null,null,[null,null,0.025],null],"NoImprintingForSpeed":false},{"name":"Fire Wyvern","statsRaw":[null,[400,0.1,0.1],null,null,null,null,[null,null,0.025],null],"NoImprintingForSpeed":false},{"name":"Lightning Wyvern","statsRaw":[null,[400,0.1,0.1],null,null,null,null,[null,null,0.025],null],"NoImprintingForSpeed":false},{"name":"Poison Wyvern","statsRaw":[null,[400,0.1,0.1],null,null,null,null,[null,null,0.025],null],"NoImprintingForSpeed":false}]}
{"ver":"1.0.2","species":[{"name":"Argentavis","statsRaw":[[null,null,0.27],[750,0.1,0.1],null,null,[350,0.02,0.04,0,0],null,[null,null,0.025],null],"NoImprintingForSpeed":false},{"name":"Lymantria","statsRaw":[null,[180,0.1,0.1],null,null,null,null,[null,null,0.025],null]},{"name":"Pelagornis","statsRaw":[[210,0.2,0.27,0.5,0],[320,0.1,0.1],null,null,[135,0.02,0.04,0,0],null,[null,null,0.025],null],"TamedBaseHealthMultiplier":1,"NoImprintingForSpeed":false},{"name":"Pteranodon","statsRaw":[[210,0.2,0.27,0.5,0],[300,0.1,0.1],null,null,[150,0.02,0.04,0,0],null,[null,null,0.018518],null],"TamedBaseHealthMultiplier":1,"NoImprintingForSpeed":false},{"name":"Quetzal","statsRaw":[[1200,0.2,0.27,0.5,0],[750,0.1,0.1],null,null,[780,0.02,0.04,0,0],null,[null,null,0.02194],null],"TamedBaseHealthMultiplier":1,"NoImprintingForSpeed":false},{"name":"Tapejara","statsRaw":[null,[450,0.1,0.1],null,null,null,null,[null,null,0.025],null],"NoImprintingForSpeed":false},{"name":"Fire Wyvern","statsRaw":[null,[400,0.1,0.1],null,null,null,null,[null,null,0.025],null],"NoImprintingForSpeed":false},{"name":"Lightning Wyvern","statsRaw":[null,[400,0.1,0.1],null,null,null,null,[null,null,0.025],null],"NoImprintingForSpeed":false},{"name":"Poison Wyvern","statsRaw":[null,[400,0.1,0.1],null,null,null,null,[null,null,0.025],null],"NoImprintingForSpeed":false}]}
Loading

0 comments on commit 69bb8d5

Please sign in to comment.