Skip to content

Feature/2212 exobiology enhancements #2649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 88 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
4971ca0
Bio scan tracking and codex entries
bcthund Jul 29, 2023
a73bff5
DiscoveryMonitor, Codex Entries and Localization
bcthund Aug 3, 2023
e2980f9
Fixed EntryID, Started Config Window, ExoBio Prep
bcthund Aug 5, 2023
20d8b6a
Sample Tracking, Sample Distance Tracking
bcthund Aug 6, 2023
a7f23ac
Cleanup, SurfaceSignalsEvent bio list updated, More Codex Entries
bcthund Aug 8, 2023
744d991
Fixes from live testing, Save and Preserve Bodies
bcthund Aug 13, 2023
c0e4d82
Organic Update, Predictions, Scripts
bcthund Aug 17, 2023
35baceb
Standardize Organics, Prediction tuning, Modify List
bcthund Aug 23, 2023
e54f2f9
Bio scan tracking and codex entries
bcthund Jul 29, 2023
f2af3da
DiscoveryMonitor, Codex Entries and Localization
bcthund Aug 3, 2023
4931504
Fixed EntryID, Started Config Window, ExoBio Prep
bcthund Aug 5, 2023
ef62ee2
Sample Tracking, Sample Distance Tracking
bcthund Aug 6, 2023
0478bc9
Cleanup, SurfaceSignalsEvent bio list updated, More Codex Entries
bcthund Aug 8, 2023
1e49d65
Fixes from live testing, Save and Preserve Bodies
bcthund Aug 13, 2023
2a40d6a
Organic Update, Predictions, Scripts
bcthund Aug 17, 2023
b523def
Additional Conflict Repairs
bcthund Aug 23, 2023
2aca5e2
Additional Conflict Repairs
bcthund Aug 23, 2023
4a16e31
Prediction update, minor tweaks
bcthund Aug 25, 2023
f5d0489
Prediction update, minor tweaks
bcthund Aug 25, 2023
b85c71c
Add missing Codex descriptions, standardize classes
bcthund Aug 29, 2023
6189b31
Added handler for SellOrganicData
bcthund Aug 29, 2023
ee636bc
Discovery Monitor Configuration Window Updated
bcthund Aug 31, 2023
e3dd18f
DiscoveryMonitor Configuration Implemented
bcthund Sep 1, 2023
fa02f49
Fixed conditions speech, Logging Update
bcthund Sep 3, 2023
b7361e7
Remove the `BaryCentre` class
Tkael Sep 3, 2023
e77c0f2
Tidy usings
Tkael Sep 3, 2023
b9d233b
Refactor and fix surface signals not being saved to the sql database.
Tkael Sep 3, 2023
bd2e213
Refactor the Astronomical and AstronomicalType definitions.
Tkael Sep 3, 2023
fffb43b
Refactor `CodexEntry`, `CodexEntryEvent`, and the matching `JournalMo…
Tkael Sep 3, 2023
5e42e06
Refactor exobiology related classes, events, and definitions to match…
Tkael Sep 4, 2023
d54a4df
Tidy up the `List()` function and update the description to document …
Tkael Sep 4, 2023
3ca8234
Debug failing unit test.
Tkael Sep 4, 2023
96f2bcd
Add unit tests for `CodexEntryEvent` and `OrganicDataSoldEvent`. Poli…
Tkael Sep 4, 2023
8c820a8
Add Discovery Monitor unit tests for scan distance checks and for the…
Tkael Sep 4, 2023
82c5856
Test the surface signals prediction engine with the default predictio…
Tkael Sep 5, 2023
1613e6d
Start a DiscoveryMonitor.resx file for UI related localization (once …
Tkael Sep 5, 2023
87955c9
Guard against holstering the organic scanner right after scanning.
Tkael Sep 5, 2023
d8ae9f4
Fixing Scripts
bcthund Oct 17, 2023
501c835
Test prediction by variants and prediction when the body is scanned b…
Tkael Sep 9, 2023
b3ce5e6
Clean up some incorrectly transcribed variant data
Tkael Sep 10, 2023
9f9ace9
Refactor ExobiologyPredictions.cs and standardize methods used for bo…
Tkael Sep 10, 2023
0b572e8
Make `SignalSource` definitions invokable
Tkael Sep 10, 2023
831e8aa
Include exobiology .ctors for species and variant rather than just ge…
Tkael Sep 10, 2023
3724a92
Predict bark mounds using the `reportedGeologicalCount` value.
Tkael Sep 10, 2023
c3282da
Further refactoring
Tkael Sep 10, 2023
aa25a6c
Remove the `enableVerboseLogging` extra option from the UI.
Tkael Sep 10, 2023
2433868
Rephrase the toggle for variant predictions Users don't need to know …
Tkael Sep 10, 2023
de9018e
Remove variant predictions
Tkael Sep 10, 2023
41750e4
Minor genus and species definition tidy-ups. Removed unused kRange pr…
Tkael Sep 10, 2023
10f3595
More definition tidy-ups.
Tkael Sep 10, 2023
01fcb08
Revert inadvertant change to `Bodies mapped` script.
Tkael Sep 10, 2023
4db9b9b
Adjust casing for `Bodies with biologicals` to match script naming co…
Tkael Sep 10, 2023
db0e511
Revert preference change in `Bodies to map`.
Tkael Sep 10, 2023
6871ac4
Improve variable naming
Tkael Sep 10, 2023
5574994
Make more data available in the `SurfaceSignals` class
Tkael Sep 11, 2023
587ff16
Further polish variables and make casing more consistent.
Tkael Sep 11, 2023
7ef7bff
Clear our tracked organic once analysis is complete.
Tkael Sep 11, 2023
482125e
Fixing Scripts
bcthund Oct 17, 2023
4a22c60
Repair Merge Issues
bcthund Oct 17, 2023
9dfd54d
Script, Prediction and Value Updates
bcthund Oct 20, 2023
838c7a2
Prediction updates, variant data expansion, script updates.
bcthund Oct 22, 2023
6b1e5a6
Predictions Update, Fix Min/Max bio values, Script fine tuning
bcthund Oct 24, 2023
5055648
Add Nebulas, Regions, Unknown Genus, Fix null predictions
bcthund Oct 27, 2023
bcd258b
Reworked Nebula data, Added Guardian sectors, Added Cllipboard Access
bcthund Oct 29, 2023
3badc30
Removed PostHandle logic from Discovery Monitor
bcthund Oct 30, 2023
44fad97
Removed redundant functions, reworks Region and Nebula logic
bcthund Oct 30, 2023
a353192
Commit lingering edits from local testing in preparation for rebase. …
bcthund Jun 25, 2024
4ea8991
Rebase Fixes and General Updates
bcthund Aug 26, 2024
6b111ab
Window Cleanup, Nebula entered Event, Serializer Repair
bcthund Aug 29, 2024
2f73244
Force Prediction Update
bcthund Aug 30, 2024
ce5ba81
Fix Species Descriptions, Update Exobiology Tab, Body Context Updates
bcthund Aug 31, 2024
a74c28c
Predicted min/max correction
bcthund Aug 31, 2024
fca993a
Fix Atmosphere Thickness, Discovery Monitor Tab Update, Fix Predictions
bcthund Sep 3, 2024
65d3db7
Auto Select Current Body, Selection Highlighting, Retain Previous Sel…
bcthund Sep 3, 2024
0b4da2f
Automatic bio selection, Allow limited ScanOrganic events on load
bcthund Sep 4, 2024
10eb774
Tracking of Visited Nebulae
bcthund Sep 5, 2024
1da90e0
Cleanup
bcthund Sep 5, 2024
2fe15be
Fix VoiceAttack Stack Overflow, Edit VA Profile
bcthund Sep 6, 2024
aac012f
Localization of GUI, Guardian Site Notification, Fix Nebula Visited
bcthund Sep 7, 2024
b5bce5b
Move Min/Max Values, Monitor for CarrierJump, Cleanup and Fixes, Prep…
bcthund Sep 8, 2024
2290f60
Removing Commented Code and Extra Debug Messages
bcthund Sep 8, 2024
5d2dff2
Corrections after Rebase
bcthund Sep 8, 2024
98ead44
Update Organic Cast, Guardian Sectors, Predictions, GUI, Guardian Sites
bcthund Sep 8, 2024
c5d373e
Fix List, Fumerola Update
bcthund Sep 8, 2024
29fa17f
Update VoiceAttack Profile
bcthund Sep 8, 2024
0819768
VoiceAttack Profile Correction
bcthund Sep 8, 2024
f1e9ae5
Fix Predicted Min/Max not set, Fix Max Predicted Value
bcthund Sep 8, 2024
e0698ed
Corrections to new Exobiology objects, Brance Prediction Updates, Pre…
bcthund Sep 10, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -220,3 +220,4 @@ Documentation.chw
# AxoCover
.axoCover/runs
/.cr/personal
/SpeechResponder/Scripts
11 changes: 11 additions & 0 deletions ConfigService/ConfigService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,16 @@ public CrimeMonitorConfiguration crimeMonitorConfiguration
}
}

public DiscoveryMonitorConfiguration discoveryMonitorConfiguration
{
get => currentConfigs[ nameof( discoveryMonitorConfiguration ) ] as DiscoveryMonitorConfiguration;
set
{
currentConfigs[ nameof( discoveryMonitorConfiguration ) ] = value;
OnPropertyChanged();
}
}

public EDDIConfiguration eddiConfiguration
{
get => currentConfigs[nameof(eddiConfiguration)] as EDDIConfiguration;
Expand Down Expand Up @@ -148,6 +158,7 @@ private ConcurrentDictionary<string, Config> ReadConfigurations(string directory
{
{nameof(cargoMonitorConfiguration), FromFile<CargoMonitorConfiguration>(directory)},
{nameof(crimeMonitorConfiguration), FromFile<CrimeMonitorConfiguration>(directory)},
{nameof(discoveryMonitorConfiguration), FromFile<DiscoveryMonitorConfiguration>(directory)},
{nameof(eddiConfiguration), FromFile<EDDIConfiguration>(directory)},
{nameof(edsmConfiguration), FromFile<StarMapConfiguration>(directory)},
{nameof(eddpConfiguration), FromFile<EddpConfiguration>(directory)},
Expand Down
158 changes: 158 additions & 0 deletions ConfigService/Configurations/DiscoveryMonitorConfiguration.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
using Newtonsoft.Json;

namespace EddiConfigService.Configurations
{
/// <summary>Configuration for the Galnet monitor</summary>
[JsonObject(MemberSerialization.OptOut), RelativePath(@"\discoverymonitor.json")]
public class DiscoveryMonitorConfiguration : Config
{
// Enables the debugging messages I used to implement codex and exobiology features
// Still requires the overall verbose logging to be enabled for EDDI
// This is not available everywhere so a few things always show up with verbose logging
//public bool enableLogging;
public Exobiology exobiology = new Exobiology();
//public Codex codex = new Codex();

public class Exobiology
{
//public bool reportSlowBios = false;
//public bool reportDestinationBios = true;
//public bool reportBiosInSystemReport = true;
//public bool reportBiosAfterSystemScan = true;
//public int minimumBiosForReporting = 0;

public class Predictions
{
// Legacy
public bool skipGroundStructIce = true; // Crystalline Shards
public bool skipCone = false; // Bark Mounds
public bool skipBrancae = true; // Brain Trees
public bool skipTubers = false; // Sinuous Tubers

// Odyssey
//public bool skipAleoids = false; // Aleoida
//public bool skipVents = false; // Amphora
//public bool skipSphere = false; // Anemone
//public bool skipBacterial = false; // Bacterium
//public bool skipCactoid = false; // Cactoida
//public bool skipClypeus = false; // Clypeus
//public bool skipConchas = false; // Concha
//public bool skipElectricae = false; // Electricae
//public bool skipFonticulus = false; // Fonticulua
//public bool skipShrubs = false; // Frutexa
//public bool skipFumerolas = false; // Fumerola
//public bool skipFungoids = false; // Fungoida
//public bool skipOsseus = false; // Osseus
//public bool skipRecepta = false; // Recepta
//public bool skipStratum = false; // Stratum
//public bool skipTubus = false; // Tubus
//public bool skipTussocks = false; // Tussock

// Non-predictable
//public bool skipMineralSpheres = false;
//public bool skipMetallicCrystals = false;
//public bool skipSilicateCrystals = false;
//public bool skipIceCrystals = false;
//public bool skipMolluscReel = false;
//public bool skipMolluscGlobe = false;
//public bool skipMolluscBell = false;
//public bool skipMolluscUmbrella = false;
//public bool skipMolluscGourd = false;
//public bool skipMolluscTorus = false;
//public bool skipMolluscBulb = false;
//public bool skipMolluscParasol = false;
//public bool skipMolluscSquid = false;
//public bool skipMolluscBullet = false;
//public bool skipMolluscCapsule = false;
//public bool skipCollaredPod = false;
//public bool skipStolonPod = false;
//public bool skipStolonTree = false;
//public bool skipAsterPod = false;
//public bool skipChalicePod = false;
//public bool skipPedunclePod = false;
//public bool skipRhizomePod = false;
//public bool skipQuadripartitePod = false;
//public bool skipVoidPod = false;
//public bool skipAsterTree = false;
//public bool skipPeduncleTree = false;
//public bool skipGyreTree = false;
//public bool skipGyrePod = false;
//public bool skipVoidHeart = false;
//public bool skipCalcitePlates = false;
//public bool skipThargoidBarnacle = false;
}
public Predictions predictions = new Predictions();

// public class DataSold
// {
// public bool reportBreakdown = false;
// public bool reportTotalAlways = true;
// }
// public DataSold dataSold = new DataSold();

// public class Scans
// {
// public bool reportBaseValue = true;
// public bool humanizeBaseValue = true;
// public bool reportBonusValue = true;
// public bool humanizeBonusValue = true;
// public bool reportLocation = false;
// public bool recommendOtherBios = true;
// public int reportGenusOnScan = 0;
// public int reportSpeciesOnScan = 0;
// public int reportConditionsOnScan = 0;
// }
// public Scans scans = new Scans();
}

//public class Codex
//{
// public bool reportAllScans = false;
// public bool reportNewEntries = true;
// public bool reportNewTraits = true;
// public bool reportVoucherAmounts = true;
// public bool reportNewDetailsOnly = true;
// public bool reportSystem = true;
// public bool reportRegion = true;

// public class Astronomicals
// {
// public bool enable = true;
// public bool reportType = true;
// public bool reportDetails = true;
// }
// public Astronomicals astronomicals = new Astronomicals();

// public class Biologicals
// {
// public bool enable;
// public bool reportGenusDetails;
// public bool reportSpeciesDetails;
// public bool reportConditions;
// }
// public Biologicals biologicals = new Biologicals();

// public class Geologicals
// {
// public bool enable = true;
// public bool reportClass = true;
// public bool reportDetails = true;
// }
// public Geologicals geologicals = new Geologicals();

// public class Guardian
// {
// public bool enable = true;
// public bool reportDetails = true;
// }
// public Guardian guardian = new Guardian();

// public class Thargoid
// {
// public bool enable = true;
// public bool reportDetails = true;
// }
// public Thargoid thargoid = new Thargoid();
//}
}
}
Loading