Skip to content

Commit

Permalink
fix for singleplayer multipliers for Giganotosaurus. fixed general si…
Browse files Browse the repository at this point in the history
…ngle-player-multipliers. improved manual timer creation. multiple timers can be deleted at once in raising- and timer-tab. added possibility to edit maturation- and incubation-timers. added red-highlighting if 100% imprinting might require checking the "exactly, don't adjust"-checkbox. fixed species in breeding-planner when looking for best breeding-partners.
  • Loading branch information
cadaei committed Oct 15, 2017
1 parent 5537cfe commit 340ede2
Show file tree
Hide file tree
Showing 15 changed files with 426 additions and 181 deletions.
3 changes: 3 additions & 0 deletions ARKBreedingStats/ARKBreedingStats.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,9 @@
<Compile Include="settings\customSoundChooser.Designer.cs">
<DependentUpon>customSoundChooser.cs</DependentUpon>
</Compile>
<Compile Include="uiControls\ButtonAddTime.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="uiControls\NamePatterns.cs" />
<Compile Include="uiControls\nud.cs">
<SubType>Component</SubType>
Expand Down
2 changes: 1 addition & 1 deletion ARKBreedingStats/BreedingPlan.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public partial class BreedingPlan : UserControl
private List<PedigreeCreature> pcs = new List<PedigreeCreature>();
private List<PictureBox> pbs = new List<PictureBox>();
private bool[] enabledColorRegions;
private TimeSpan incubationTime = new TimeSpan(0);
private TimeSpan incubationTime = TimeSpan.Zero;
public Creature chosenCreature = null;
public StatWeighting statWeighting;
public bool breedingPlanNeedsUpdate;
Expand Down
6 changes: 3 additions & 3 deletions ARKBreedingStats/CreatureInfoInput.cs
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ private void numericUpDownWeight_ValueChanged(object sender, EventArgs e)
updateMaturation = false;
if (Values.V.species[speciesIndex].breeding != null && weightStat.Input > 0)
dhmInputGrown.Timespan = new TimeSpan(0, 0, (int)(Values.V.species[speciesIndex].breeding.maturationTimeAdjusted * (1 - (double)numericUpDownWeight.Value / weightStat.Input)));
else dhmInputGrown.Timespan = new TimeSpan(0);
else dhmInputGrown.Timespan = TimeSpan.Zero;
updateMaturationPercentage();
updateMaturation = true;
}
Expand Down Expand Up @@ -314,8 +314,8 @@ public int SpeciesIndex
if (!breedingPossible)
{
numericUpDownWeight.Value = 0;
dhmInputGrown.Timespan = new TimeSpan(0);
dhmInputCooldown.Timespan = new TimeSpan(0);
dhmInputGrown.Timespan = TimeSpan.Zero;
dhmInputCooldown.Timespan = TimeSpan.Zero;
}
}
}
Expand Down
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.

14 changes: 12 additions & 2 deletions ARKBreedingStats/Form1.cs
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,7 @@ private void clearAll()
this.numericUpDownLowerTEffBound.BackColor = SystemColors.Window;
this.numericUpDownUpperTEffBound.BackColor = SystemColors.Window;
this.checkBoxJustTamed.BackColor = System.Drawing.Color.Transparent;
cbExactlyImprinting.BackColor = Color.Transparent;
panelSums.BackColor = System.Drawing.Color.Transparent;
panelWildTamedBred.BackColor = System.Drawing.Color.Transparent;
labelTE.BackColor = System.Drawing.Color.Transparent;
Expand Down Expand Up @@ -447,6 +448,9 @@ private bool extractLevels(bool autoExtraction = false)

bool imprintingBonusChanged;

if (numericUpDownImprintingBonusExtractor.Value == 100 && !cbExactlyImprinting.Checked)
cbExactlyImprinting.BackColor = Color.LightSalmon;

extractor.extractLevels(speciesIndex, (int)numericUpDownLevel.Value, statIOs,
(double)numericUpDownLowerTEffBound.Value / 100, (double)numericUpDownUpperTEffBound.Value / 100,
!radioButtonBred.Checked, radioButtonTamed.Checked, false, radioButtonBred.Checked,
Expand Down Expand Up @@ -724,6 +728,7 @@ private void showSumOfChosenLevels()
{
radarChartExtractor.setLevels(statIOs.Select(s => s.LevelWild).ToArray());
toolStripButtonSaveCreatureValuesTemp.Visible = false;
cbExactlyImprinting.BackColor = Color.Transparent;
}
creatureInfoInputExtractor.ButtonEnabled = allValid;
groupBoxRadarChartExtractor.Visible = allValid;
Expand Down Expand Up @@ -1166,8 +1171,11 @@ private void initializeCollection()
private void applySettingsToValues()
{
// apply multipliers
Values.V.applyMultipliers(creatureCollection);
applyEvolutionMultipliers();
Values.V.applyMultipliers(creatureCollection, cbEventMultipliers.Checked);
tamingControl1.setTamingMultipliers(Values.V.tamingSpeedMultiplier,
cbEventMultipliers.Checked ? creatureCollection.tamingFoodRateMultiplierEvent : creatureCollection.tamingFoodRateMultiplier);
breedingPlan1.updateBreedingData();
raisingControl1.updateRaisingData();

// apply level settings
creatureBoxListView.BarMaxLevel = creatureCollection.maxChartLevel;
Expand Down Expand Up @@ -3164,6 +3172,8 @@ private void showBestBreedingPartner(Creature c)
if (c.status != CreatureStatus.Available
&& MessageBox.Show("Selected Creature is currently not marked as \"Available\" and thus cannot be considered for breeding. Do you want to change its status to \"Available\"?", "Selected Creature not Available", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
setStatus(new List<Creature>() { c }, CreatureStatus.Available);
breedingPlan1.breedingPlanNeedsUpdate = false;
comboBoxSpeciesGlobal.SelectedIndex = Values.V.speciesNames.IndexOf(c.species);
breedingPlan1.determineBestBreeding(c);
tabControlMain.SelectedTab = tabPageBreedingPlan;
}
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.20")]
[assembly: AssemblyFileVersion("0.23.21")]
Loading

0 comments on commit 340ede2

Please sign in to comment.