diff --git a/ARKBreedingStats/Form1.Designer.cs b/ARKBreedingStats/Form1.Designer.cs index 231cf7c9..7011fa4a 100644 --- a/ARKBreedingStats/Form1.Designer.cs +++ b/ARKBreedingStats/Form1.Designer.cs @@ -357,6 +357,7 @@ private void InitializeComponent() this.contextMenuStripLibraryHeader = new System.Windows.Forms.ContextMenuStrip(this.components); this.toolStripMenuItemResetLibraryColumnWidths = new System.Windows.Forms.ToolStripMenuItem(); this.speciesSelector1 = new ARKBreedingStats.SpeciesSelector(); + this.columnHeaderMutagen = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDownImprintingBonusTester)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NumericUpDownTestingTE)).BeginInit(); @@ -2094,7 +2095,8 @@ private void InitializeComponent() this.columnHeaderSpecies, this.columnHeaderStatus, this.columnHeaderTribe, - this.columnHeaderStatusIcon}); + this.columnHeaderStatusIcon, + this.columnHeaderMutagen}); this.listViewLibrary.ContextMenuStrip = this.contextMenuStripLibrary; this.listViewLibrary.Dock = System.Windows.Forms.DockStyle.Fill; this.listViewLibrary.FullRowSelect = true; @@ -3512,6 +3514,11 @@ private void InitializeComponent() this.speciesSelector1.SplitterDistance = 500; this.speciesSelector1.TabIndex = 0; // + // columnHeaderMutagen + // + this.columnHeaderMutagen.Text = "Mutagen"; + this.columnHeaderMutagen.Width = 30; + // // Form1 // this.AcceptButton = this.btExtractLevels; @@ -3943,5 +3950,6 @@ private void InitializeComponent() private System.Windows.Forms.Button BtCopyLibraryColorToClipboard; private System.Windows.Forms.CheckBox CbLibraryInfoUseFilter; private System.Windows.Forms.TextBox TbMessageLabel; + private System.Windows.Forms.ColumnHeader columnHeaderMutagen; } } diff --git a/ARKBreedingStats/Form1.cs b/ARKBreedingStats/Form1.cs index 96be6f63..465e9446 100644 --- a/ARKBreedingStats/Form1.cs +++ b/ARKBreedingStats/Form1.cs @@ -3510,7 +3510,7 @@ private void ReloadNamePatternCustomReplacings(PatternEditor pe = null) private void toolStripMenuItemResetLibraryColumnWidths_Click(object sender, EventArgs e) { for (int ci = 0; ci < listViewLibrary.Columns.Count; ci++) - listViewLibrary.Columns[ci].Width = (ci > 11 && ci < 30) ? 30 : 60; + listViewLibrary.Columns[ci].Width = ((ci >= ColumnIndexFirstStat && ci < ColumnIndexPostColor) || ci == ColumnIndexMutagenApplied) ? 30 : 60; } private void copyInfographicToClipboardToolStripMenuItem_Click(object sender, EventArgs e) diff --git a/ARKBreedingStats/Form1.library.cs b/ARKBreedingStats/Form1.library.cs index e97f8a4a..63d3836f 100644 --- a/ARKBreedingStats/Form1.library.cs +++ b/ARKBreedingStats/Form1.library.cs @@ -938,6 +938,20 @@ private void UpdateCreatureListViewItem(Creature creature) } } + private const int ColumnIndexName = 0; + private const int ColumnIndexSex = 4; + private const int ColumnIndexAdded = 5; + private const int ColumnIndexTopness = 6; + private const int ColumnIndexTopStats = 7; + private const int ColumnIndexGeneration = 8; + private const int ColumnIndexWildLevel = 9; + private const int ColumnIndexMutations = 10; + private const int ColumnIndexCountdown = 11; + private const int ColumnIndexFirstStat = 12; + private const int ColumnIndexFirstColor = 24; + private const int ColumnIndexPostColor = 30; + private const int ColumnIndexMutagenApplied = 34; + private ListViewItem CreateCreatureLvItem(Creature cr) { if (cr.flags.HasFlag(CreatureFlags.Divider)) @@ -950,79 +964,82 @@ private ListViewItem CreateCreatureLvItem(Creature cr) double colorFactor = 100d / _creatureCollection.maxChartLevel; - string[] subItems = new[] - { - cr.name, - cr.owner, - cr.note, - cr.server, - Utils.SexSymbol(cr.sex), - cr.domesticatedAt?.ToString("yyyy'-'MM'-'dd HH':'mm':'ss") ?? string.Empty, - (cr.topness / 10).ToString(), - cr.topStatsCount.ToString(), - cr.generation.ToString(), - cr.levelFound.ToString(), - cr.Mutations.ToString(), - DisplayedCreatureCountdown(cr, out var cooldownForeColor, out var cooldownBackColor) + string[] subItems = new[] { + cr.name, + cr.owner, + cr.note, + cr.server, + Utils.SexSymbol(cr.sex), + cr.domesticatedAt?.ToString("yyyy'-'MM'-'dd HH':'mm':'ss") ?? string.Empty, + (cr.topness / 10).ToString(), + cr.topStatsCount.ToString(), + cr.generation.ToString(), + cr.levelFound.ToString(), + cr.Mutations.ToString(), + DisplayedCreatureCountdown(cr, out var cooldownForeColor, out var cooldownBackColor) } - .Concat(cr.levelsWild.Select(x => x.ToString()).ToArray()) + .Concat(cr.levelsWild.Select(x => x.ToString())) + .Concat(Properties.Settings.Default.showColorsInLibrary + ? cr.colors.Select(cl => cl.ToString()) + : new string[Ark.ColorRegionCount] + ) + .Concat(new[] { + cr.Species.DescriptiveNameAndMod, + cr.Status.ToString(), + cr.tribe, + Utils.StatusSymbol(cr.Status, string.Empty), + (cr.flags & CreatureFlags.MutagenApplied) != 0 ? "M" : string.Empty + }) .ToArray(); - if (Properties.Settings.Default.showColorsInLibrary) - subItems = subItems.Concat(cr.colors.Select(cl => cl.ToString()).ToArray()).ToArray(); - else - subItems = subItems.Concat(new string[6]).ToArray(); - - // add the species and status and tribe - subItems = subItems.Concat(new[] { - cr.Species.DescriptiveNameAndMod, - cr.Status.ToString(), - cr.tribe, - Utils.StatusSymbol(cr.Status, string.Empty) - }).ToArray(); - // check if groups for species are displayed - ListViewItem lvi = new ListViewItem(subItems); + ListViewItem lvi = new ListViewItem(subItems) { Tag = cr }; + + // apply colors to the subItems for (int s = 0; s < Stats.StatsCount; s++) { if (cr.valuesDom[s] == 0) { // not used - lvi.SubItems[s + 12].ForeColor = Color.White; - lvi.SubItems[s + 12].BackColor = Color.White; + lvi.SubItems[ColumnIndexFirstStat + s].ForeColor = Color.White; + lvi.SubItems[ColumnIndexFirstStat + s].BackColor = Color.White; } else if (cr.levelsWild[s] < 0) { // unknown level - lvi.SubItems[s + 12].ForeColor = Color.WhiteSmoke; - lvi.SubItems[s + 12].BackColor = Color.White; + lvi.SubItems[ColumnIndexFirstStat + s].ForeColor = Color.WhiteSmoke; + lvi.SubItems[ColumnIndexFirstStat + s].BackColor = Color.White; } else - lvi.SubItems[s + 12].BackColor = Utils.GetColorFromPercent((int)(cr.levelsWild[s] * (s == Stats.Torpidity ? colorFactor / 7 : colorFactor)), // TODO set factor to number of other stats (flyers have 6, Gacha has 8?) + lvi.SubItems[ColumnIndexFirstStat + s].BackColor = Utils.GetColorFromPercent((int)(cr.levelsWild[s] * (s == Stats.Torpidity ? colorFactor / 7 : colorFactor)), // TODO set factor to number of other stats (flyers have 6, Gacha has 8?) _considerStatHighlight[s] ? cr.topBreedingStats[s] ? 0.2 : 0.7 : 0.93); } - lvi.SubItems[4].BackColor = cr.flags.HasFlag(CreatureFlags.Neutered) ? Color.FromArgb(220, 220, 220) : + lvi.SubItems[ColumnIndexSex].BackColor = cr.flags.HasFlag(CreatureFlags.Neutered) ? Color.FromArgb(220, 220, 220) : cr.sex == Sex.Female ? Color.FromArgb(255, 230, 255) : cr.sex == Sex.Male ? Color.FromArgb(220, 235, 255) : SystemColors.Window; - if (cr.Status == CreatureStatus.Dead) - { - lvi.SubItems[0].ForeColor = SystemColors.GrayText; - lvi.BackColor = Color.FromArgb(255, 250, 240); - } - else if (cr.Status == CreatureStatus.Unavailable) - { - lvi.SubItems[0].ForeColor = SystemColors.GrayText; - } - else if (cr.Status == CreatureStatus.Obelisk) - { - lvi.SubItems[0].ForeColor = Color.DarkBlue; - } - else if (_creatureCollection.maxServerLevel > 0 - && cr.levelsWild[Stats.Torpidity] + 1 + _creatureCollection.maxDomLevel > _creatureCollection.maxServerLevel + (cr.Species.name.StartsWith("X-") || cr.Species.name.StartsWith("R-") ? 50 : 0)) + switch (cr.Status) { - lvi.SubItems[0].ForeColor = Color.OrangeRed; // this creature may pass the max server level and could be deleted by the game + case CreatureStatus.Dead: + lvi.SubItems[ColumnIndexName].ForeColor = SystemColors.GrayText; + lvi.BackColor = Color.FromArgb(255, 250, 240); + break; + case CreatureStatus.Unavailable: + lvi.SubItems[ColumnIndexName].ForeColor = SystemColors.GrayText; + break; + case CreatureStatus.Obelisk: + lvi.SubItems[ColumnIndexName].ForeColor = Color.DarkBlue; + break; + default: + { + if (_creatureCollection.maxServerLevel > 0 + && cr.levelsWild[Stats.Torpidity] + 1 + _creatureCollection.maxDomLevel > _creatureCollection.maxServerLevel + (cr.Species.name.StartsWith("X-") || cr.Species.name.StartsWith("R-") ? 50 : 0)) + { + lvi.SubItems[ColumnIndexName].ForeColor = Color.OrangeRed; // this creature may pass the max server level and could be deleted by the game + } + break; + } } lvi.UseItemStyleForSubItems = false; @@ -1037,64 +1054,63 @@ private ListViewItem CreateCreatureLvItem(Creature cr) else lvi.BackColor = Color.LightGreen; } - lvi.SubItems[7].BackColor = Utils.GetColorFromPercent(cr.topStatsCount * 8 + 44, 0.7); + lvi.SubItems[ColumnIndexTopStats].BackColor = Utils.GetColorFromPercent(cr.topStatsCount * 8 + 44, 0.7); } else { - lvi.SubItems[7].ForeColor = Color.LightGray; + lvi.SubItems[ColumnIndexTopStats].ForeColor = Color.LightGray; } // color for timestamp domesticated if (cr.domesticatedAt == null || cr.domesticatedAt.Value.Year < 2015) { - lvi.SubItems[5].Text = "n/a"; - lvi.SubItems[5].ForeColor = Color.LightGray; + lvi.SubItems[ColumnIndexAdded].Text = "n/a"; + lvi.SubItems[ColumnIndexAdded].ForeColor = Color.LightGray; } // color for topness - lvi.SubItems[6].BackColor = Utils.GetColorFromPercent(cr.topness / 5 - 100, 0.8); // topness is in permille. gradient from 50-100 + lvi.SubItems[ColumnIndexTopness].BackColor = Utils.GetColorFromPercent(cr.topness / 5 - 100, 0.8); // topness is in permille. gradient from 50-100 // color for generation if (cr.generation == 0) - lvi.SubItems[8].ForeColor = Color.LightGray; + lvi.SubItems[ColumnIndexGeneration].ForeColor = Color.LightGray; // color of WildLevelColumn if (cr.levelFound == 0) - lvi.SubItems[9].ForeColor = Color.LightGray; + lvi.SubItems[ColumnIndexWildLevel].ForeColor = Color.LightGray; // color for mutation if (cr.Mutations > 0) { - if (cr.Mutations > 19) - lvi.SubItems[10].BackColor = Utils.MutationColorOverLimit; + if (cr.Mutations < Ark.MutationPossibleWithLessThan) + lvi.SubItems[ColumnIndexMutations].BackColor = Utils.MutationColor; else - lvi.SubItems[10].BackColor = Utils.MutationColor; + lvi.SubItems[ColumnIndexMutations].BackColor = Utils.MutationColorOverLimit; } else - lvi.SubItems[10].ForeColor = Color.LightGray; + lvi.SubItems[ColumnIndexMutations].ForeColor = Color.LightGray; // color for cooldown - lvi.SubItems[11].ForeColor = cooldownForeColor; - lvi.SubItems[11].BackColor = cooldownBackColor; + lvi.SubItems[ColumnIndexCountdown].ForeColor = cooldownForeColor; + lvi.SubItems[ColumnIndexCountdown].BackColor = cooldownBackColor; if (Properties.Settings.Default.showColorsInLibrary) { // color for colors - for (int cl = 0; cl < 6; cl++) + for (int cl = 0; cl < Ark.ColorRegionCount; cl++) { if (cr.colors[cl] != 0) { - lvi.SubItems[24 + cl].BackColor = CreatureColors.CreatureColor(cr.colors[cl]); - lvi.SubItems[24 + cl].ForeColor = Utils.ForeColor(lvi.SubItems[24 + cl].BackColor); + lvi.SubItems[ColumnIndexFirstColor + cl].BackColor = CreatureColors.CreatureColor(cr.colors[cl]); + lvi.SubItems[ColumnIndexFirstColor + cl].ForeColor = Utils.ForeColor(lvi.SubItems[ColumnIndexFirstColor + cl].BackColor); } else { - lvi.SubItems[24 + cl].ForeColor = cr.Species.EnabledColorRegions[cl] ? Color.LightGray : Color.White; + lvi.SubItems[ColumnIndexFirstColor + cl].ForeColor = cr.Species.EnabledColorRegions[cl] ? Color.LightGray : Color.White; } } } - lvi.Tag = cr; return lvi; } @@ -1295,7 +1311,7 @@ private void FilterLib(bool selectFirstIfNothingIsSelected = false) } for (int s = 0; s < Stats.StatsCount; s++) - listViewLibrary.Columns[12 + s].Text = Utils.StatName(s, true, customStatNames); + listViewLibrary.Columns[ColumnIndexFirstStat + s].Text = Utils.StatName(s, true, customStatNames); _creaturesPreFiltered = ApplyLibraryFilterSettings(filteredList).ToArray(); } @@ -1845,8 +1861,8 @@ private void AdminCommandToSetColors() var cr = _creaturesDisplayed[listViewLibrary.SelectedIndices[0]]; byte[] cl = cr.colors; if (cl == null) return; - var colorCommands = new List(6); - for (int ci = 0; ci < 6; ci++) + var colorCommands = new List(Ark.ColorRegionCount); + for (int ci = 0; ci < Ark.ColorRegionCount; ci++) { if (cr.Species.EnabledColorRegions[ci]) colorCommands.Add($"setTargetDinoColor {ci} {cl[ci]}"); diff --git a/ARKBreedingStats/Properties/AssemblyInfo.cs b/ARKBreedingStats/Properties/AssemblyInfo.cs index 9e9af66b..0bb2c48f 100644 --- a/ARKBreedingStats/Properties/AssemblyInfo.cs +++ b/ARKBreedingStats/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ // Revision // [assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("0.56.2.0")] +[assembly: AssemblyFileVersion("0.56.3.0")] [assembly: NeutralResourcesLanguage("en")] diff --git a/ARKBreedingStats/_manifest.json b/ARKBreedingStats/_manifest.json index 5e9db163..aae82b71 100644 --- a/ARKBreedingStats/_manifest.json +++ b/ARKBreedingStats/_manifest.json @@ -4,7 +4,7 @@ "ARK Smart Breeding": { "Id": "ARK Smart Breeding", "Category": "main", - "version": "0.56.2.0" + "version": "0.56.3.0" }, "SpeciesColorImages": { "Id": "SpeciesColorImages", diff --git a/ARKBreedingStats/json/values/_manifest.json b/ARKBreedingStats/json/values/_manifest.json index 5a2c8f32..d0d9c0fe 100644 --- a/ARKBreedingStats/json/values/_manifest.json +++ b/ARKBreedingStats/json/values/_manifest.json @@ -43,7 +43,7 @@ "mod": { "id": "1178308359", "tag": "ShadDragon", "title": "Shad's Tameable Bosses" } }, "1188224480-OgAlphas.json": { - "version": "342.13.1623206057", + "version": "358.11.1623206057", "mod": { "id": "1188224480", "tag": "OgAlphas", "title": "OgAlphas" } }, "1206835819-AncientEarthModCollection.json": { @@ -72,7 +72,7 @@ "mod": { "id": "1356703358", "tag": "Primal_Fear_Noxious_Creatures", "title": "Primal Fear Noxious Creatures" } }, "1373744537-AC2.json": { - "version": "358.11.1693637981", + "version": "358.11.1695149665", "mod": { "id": "1373744537", "tag": "AC2", "title": "Additional Creatures 2: Wild Ark" } }, "1379111008-RealismPlus.json": { @@ -83,6 +83,10 @@ "version": "358.10.1690909595", "mod": { "id": "1405944717", "tag": "Project_Evolution", "title": "JP's Server Tweaks" } }, + "1416912482-BunExtras.json": { + "version": "358.11.1654224079", + "mod": { "id": "1416912482", "tag": "BunExtras", "title": "Bunn3h's Extras" } + }, "1420423699-ARKaeologyDinos.json": { "version": "340.3.1529794293", "mod": { "id": "1420423699", "tag": "ARKaeologyDinos", "title": "ARKaeology Dinos" } @@ -107,6 +111,10 @@ "version": "357.4.1679444826", "mod": { "id": "1523045986", "tag": "Paranoia", "title": "Additional Creatures 2: Paranoia!" } }, + "1558114752-Radioactive.json": { + "version": "358.11.1616346857", + "mod": { "id": "1558114752", "tag": "Radioactive", "title": "Dino Hybrids & more!" } + }, "1565015734-BetterDinosTest.json": { "version": "356.12.1659982227", "mod": { "id": "1565015734", "tag": "BetterDinosTest", "title": "Better Dinos" } @@ -145,13 +153,17 @@ "mod": { "id": "1662691167", "tag": "Senior", "title": "Additional Creatures: Senior Class" } }, "1675895024-NoUntameables.json": { - "version": "358.10.1691123197", + "version": "358.11.1695172002", "mod": { "id": "1675895024", "tag": "NoUntameables", "title": "No Untameables" } }, "1676159020-Aquaria.json": { "version": "358.9.1690158145", "mod": { "id": "1676159020", "tag": "Aquaria", "title": "Additional Creatures: Aquaria" } }, + "1679826889-Cavallus.json": { + "version": "358.11.1684656674", + "mod": { "id": "1679826889", "tag": "Cavallus", "title": "Caballus Custom Map - The Equestrian Land" } + }, "1681125667-Primal_Fear_EX.json": { "version": "356.5.1561175829", "mod": { "id": "1681125667", "tag": "Primal_Fear_EX", "title": "Primal Fear Extinction Expansion" } @@ -174,7 +186,7 @@ "mod": { "id": "1734595558", "tag": "Pyria2", "title": "Pyria: The Second Chapter" } }, "1754846792-Zythara_Critters.json": { - "version": "358.8.1688851941", + "version": "358.17.1696180721", "mod": { "id": "1754846792", "tag": "Zythara_Critters", "title": "Zythara Critters" } }, "1768499278-BalancedJPE.json": { @@ -190,7 +202,7 @@ "mod": { "id": "1783616332", "tag": "IceWyvernMating", "title": "Ice Wyvern Mating" } }, "1785800853-Behavorial-Expansion.json": { - "version": "340.3.1590247291", + "version": "358.11.1590247291", "mod": { "id": "1785800853", "tag": "Behavorial-Expansion", "title": "ArkTranscendence" } }, "1787443195-ChasmAdditionalDinos.json": { @@ -218,6 +230,10 @@ "version": "340.3.1567287477", "mod": { "id": "1850732334", "tag": "ForestWyvern", "title": "Forest Wyvern Remastered" } }, + "1852495701-BetterGiggles.json": { + "version": "358.11.1628155435", + "mod": { "id": "1852495701", "tag": "BetterGiggles", "title": "Shad's Better Gigas" } + }, "1908568783-BarbaryLion.json": { "version": "354.4.1669589908", "mod": { "id": "1908568783", "tag": "BarbaryLion", "title": "AC: Bonus Content" } @@ -230,6 +246,10 @@ "version": "340.3.1581239136", "mod": { "id": "1934081600", "tag": "SoloFarmAnky", "title": "Solo Farm Mod" } }, + "1979037318-IceWyverns.json": { + "version": "358.11.1695151363", + "mod": { "id": "1979037318", "tag": "IceWyverns", "title": "Shads Critter Reworks" } + }, "1984129536-MTSMod.json": { "version": "347.1.1657580546", "mod": { "id": "1984129536", "tag": "MTSMod", "title": "MTS.co.uk Community Mod" } @@ -291,13 +311,25 @@ "mod": { "id": "2362246280", "tag": "GigaFullTame", "title": "Giga Full Tame" } }, "2447186973-ArkOmega.json": { - "version": "358.8.1688621034", + "version": "358.11.1695446237", "mod": { "id": "2447186973", "tag": "ArkOmega", "title": "Ark Omega" } }, + "2453342929-MoreDragonsMod.json": { + "version": "358.11.1691443191", + "mod": { "id": "2453342929", "tag": "MoreDragonsMod", "title": "More Dragons Evolved" } + }, + "2472371628-MilicrocaWarriors_MOD.json": { + "version": "358.11.1653930637", + "mod": { "id": "2472371628", "tag": "MilicrocaWarriors_MOD", "title": "MilicrocaWarriors" } + }, "2493949846-Endemics.json": { "version": "356.5.1675373446", "mod": { "id": "2493949846", "tag": "Endemics", "title": "Additional Creatures: Endemics" } }, + "2621340621-BreedableGriffins.json": { + "version": "358.11.1660289939", + "mod": { "id": "2621340621", "tag": "BreedableGriffins", "title": "Breedable Griffins [Conversion]" } + }, "2683373846-ZazaCollection_2.json": { "version": "356.5.1643227949", "mod": { "id": "2683373846", "tag": "ZazaCollection_2", "title": "Zaza's Collection" } @@ -310,9 +342,25 @@ "version": "358.9.1687204735", "mod": { "id": "2869411055", "tag": "SDinoVariants", "title": "SDinoVariants" } }, + "2895059095-TaeniaStella.json": { + "version": "358.11.1691285412", + "mod": { "id": "2895059095", "tag": "TaeniaStella", "title": "TaeniaStella The RenewalAlpha" } + }, + "2902657380-Dinohunterworld.json": { + "version": "358.11.1674629012", + "mod": { "id": "2902657380", "tag": "Dinohunterworld", "title": "Dino Hunter World" } + }, + "2953890191-ExtraAberrantVariants.json": { + "version": "358.11.1693427566", + "mod": { "id": "2953890191", "tag": "ExtraAberrantVariants", "title": "Extra Aberrant Variants" } + }, + "3035755339-PortsOfAtlas.json": { + "version": "358.11.1695724861", + "mod": { "id": "3035755339", "tag": "PortsOfAtlas", "title": "Atlas Imports - Parrot" } + }, "710880648-DinoOverHaulMODX.json": { - "version": "358.11.1694019960", - "mod": { "id": "710880648", "tag": "DinoOverHaulMODX", "title": "DinoOverhaul X -- Hardcore PvE Experience" } + "version": "358.11.1695938537", + "mod": { "id": "710880648", "tag": "DinoOverHaulMODX", "title": "DinoOverhaul X -- Hardcore PvE Experience - Est June 2015" } }, "729352919-IndomRex.json": { "version": "356.5.1488771984", @@ -327,7 +375,7 @@ "mod": { "id": "839162288", "tag": "Primal_Fear", "title": "Primal Fear" } }, "883957187-WyvernWorld.json": { - "version": "342.13.1638248815", + "version": "358.11.1638248815", "mod": { "id": "883957187", "tag": "WyvernWorld", "title": "Wyvern World" } }, "893735676-AE.json": { diff --git a/ARKBreedingStats/utils/CreatureListSorter.cs b/ARKBreedingStats/utils/CreatureListSorter.cs index 33d40898..7f17eca5 100644 --- a/ARKBreedingStats/utils/CreatureListSorter.cs +++ b/ARKBreedingStats/utils/CreatureListSorter.cs @@ -139,7 +139,8 @@ private IEnumerable OrderList(IEnumerable list, IComparer c.Species?.DescriptiveNameAndMod, c => c.Status, c => c.tribe, - c => c.Status + c => c.Status, + c => c.flags & CreatureFlags.MutagenApplied }; } } diff --git a/ArkSavegameToolkit b/ArkSavegameToolkit index 95c0e875..3c32f3ce 160000 --- a/ArkSavegameToolkit +++ b/ArkSavegameToolkit @@ -1 +1 @@ -Subproject commit 95c0e8754161cd9cb2117d592906d882c05fc879 +Subproject commit 3c32f3ceccccc9fb7d2d0a690be4187c83d4d997