Skip to content

Commit

Permalink
Organic Checklist now shows discovered when bio is codex scanned
Browse files Browse the repository at this point in the history
  • Loading branch information
@WarmedxMints
WarmedxMints committed Jan 10, 2025
1 parent 4ae5cf7 commit 2761650
Show file tree
Hide file tree
Showing 4 changed files with 72 additions and 7 deletions.
2 changes: 1 addition & 1 deletion ODExplorer/App.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public partial class App : Application
{
public static readonly Logger Logger = LogManager.GetCurrentClassLogger();

public static readonly Version AppVersion = new(2, 0, 7);
public static readonly Version AppVersion = new(2, 0, 8);
#if INSTALL
public readonly static string BaseDirectory = System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "OD Explorer");
#else
Expand Down
45 changes: 41 additions & 4 deletions ODExplorer/Stores/OrganicCheckListDataStore.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using static System.Windows.Forms.AxHost;

namespace ODExplorer.Stores
{
Expand Down Expand Up @@ -103,7 +104,7 @@ private void AddBioScan(ScanOrganicEvent.ScanOrganicEventArgs scanOrganic)
return;

item.AddRegion(currentRegion, state);
if (string.IsNullOrEmpty(scanOrganic.Variant_Localised) == false)
if (string.IsNullOrEmpty(scanOrganic.Variant) == false)
{
var names = ExoData.GetNames(scanOrganic.Variant);

Expand All @@ -117,7 +118,6 @@ private void AddBioScan(ScanOrganicEvent.ScanOrganicEventArgs scanOrganic)
}
}


if (parserStore.IsLive)
OnSpeciesUpdated?.Invoke(this, scanOrganic.Genus);

Expand Down Expand Up @@ -277,8 +277,45 @@ public void ParseJournalEvent(JournalEntry e)
case CodexEntryEvent.CodexEntryEventArgs codex:
{
currentRegion = codex.Region;
if (string.IsNullOrEmpty(codex.Name) == false)
AddCodex(codex.Name);

if (codex.Category != "$Codex_Category_Biology;")
break;

if (string.IsNullOrEmpty(codex.Name))
break;

AddCodex(codex.Name);

var bioNames = ExoData.GetNames(codex.Name);

if (bioNames == null)
break;

if (OrganicScanItems.TryGetValue(bioNames.GenusCodex, out var items))
{
var item = items.FirstOrDefault(x => x.SpeciesCodex == bioNames.SpeciesCodex);

if (item is null)
return;

item.AddRegion(currentRegion, OrganicScanState.Discovered);

if (item.Variants.TryGetValue(currentRegion, out var variants))
{
var knownVariant = variants.FirstOrDefault(x => x.VaritantCodex == codex.Name);

if(knownVariant == null)
{
knownVariant = new(codex.Name, codex.Name_Localised, currentRegion, OrganicScanState.Discovered);
variants.Add(knownVariant);
}

knownVariant.State = OrganicScanState.Discovered;

if (parserStore.IsLive)
OnSpeciesUpdated?.Invoke(this, bioNames.GenusCodex);
}
}
}
break;
case ScanOrganicEvent.ScanOrganicEventArgs scanOrganic:
Expand Down
9 changes: 7 additions & 2 deletions ODExplorer/ViewModels/ModelVMs/OrganicCheckListItemViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@ public string VariantCount
{
get
{
var count = Variants.Where(x => x.StageValue >= OrganicScanState.Analysed).DistinctBy(x => x.CodexValue).Count();
var variantCount = Variants.Count;
var count = Variants.Where(x => x.StageValue >= OrganicScanState.Discovered).DistinctBy(x => x.CodexValue).Count();
return $"{count}";
}
}
Expand All @@ -74,5 +73,11 @@ public string TotalVariants
return $"{variantCount}";
}
}

public void UpdateCounts()
{
OnPropertyChanged(nameof(VariantCount));
OnPropertyChanged(nameof(TotalVariants));
}
}
}
23 changes: 23 additions & 0 deletions ODExplorer/ViewModels/ViewVMs/OrganicViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,58 +323,81 @@ private void FireUpdatePropertyChanged(string key)
switch (key)
{
case "$Codex_Ent_Aleoids_Genus_Name;":
UpdateSpeciesCounts(Aleoida);
OnPropertyChanged(nameof(Aleoida));
break;
case "$Codex_Ent_Bacterial_Genus_Name;":
UpdateSpeciesCounts(Bacterium);
OnPropertyChanged(nameof(Bacterium));
break;
case "$Codex_Ent_Cactoid_Genus_Name;":
UpdateSpeciesCounts(Cactoida);
OnPropertyChanged(nameof(Cactoida));
break;
case "$Codex_Ent_Clypeus_Genus_Name;":
UpdateSpeciesCounts(Clypeus);
OnPropertyChanged(nameof(Clypeus));
break;
case "$Codex_Ent_Conchas_Genus_Name;":
UpdateSpeciesCounts(Concha);
OnPropertyChanged(nameof(Concha));
break;
case "$Codex_Ent_Electricae_Genus_Name":
UpdateSpeciesCounts(Electricae);
OnPropertyChanged(nameof(Electricae));
break;
case "$Codex_Ent_Fonticulus_Genus_Name":
UpdateSpeciesCounts(Fonticulua);
OnPropertyChanged(nameof(Fonticulua));
break;
case "$Codex_Ent_Fumerolas_Genus_Name;":
UpdateSpeciesCounts(Fumerola);
OnPropertyChanged(nameof(Fumerola));
break;
case "$Codex_Ent_Fungoids_Genus_Name;":
UpdateSpeciesCounts(Fungoida);
OnPropertyChanged(nameof(Fungoida));
break;
case "$Codex_Ent_Osseus_Genus_Name;":
UpdateSpeciesCounts(Osseus);
OnPropertyChanged(nameof(Osseus));
break;
case "$Codex_Ent_Recepta_Genus_Name;":
UpdateSpeciesCounts(Recepta);
OnPropertyChanged(nameof(Recepta));
break;
case "$Codex_Ent_Shrubs_Genus_Name;":
UpdateSpeciesCounts(Frutexa);
OnPropertyChanged(nameof(Frutexa));
break;
case "$Codex_Ent_Stratum_Genus_Name;":
UpdateSpeciesCounts(Stratum);
OnPropertyChanged(nameof(Stratum));
break;
case "$Codex_Ent_Tubus_Genus_Name;":
UpdateSpeciesCounts(Tubus);
OnPropertyChanged(nameof(Tubus));
break;
case "$Codex_Ent_Tussocks_Genus_Name;":
UpdateSpeciesCounts(Tussock);
OnPropertyChanged(nameof(Tussock));
break;
case "Other":
UpdateSpeciesCounts(Other);
OnPropertyChanged(nameof(Other));
break;
}

CountBios();
}

private static void UpdateSpeciesCounts(IReadOnlyList<OrganicCheckListItemViewModel> list)
{
foreach(var item in list)
{
item.UpdateCounts();
}
}
private void ExplorationDataStore_OnBioDataLost(object? sender, EventArgs e)
{
BuildLostList();
Expand Down

0 comments on commit 2761650

Please sign in to comment.