Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Correct set analysis tech entry behavior breaking change #504

Merged
merged 5 commits into from
Dec 17, 2023
Merged

Correct set analysis tech entry behavior breaking change #504

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
629b3a7
Correct functionality change to SetAnalysisTechEntry
MrPurple6411 Nov 20, 2023
70b9519
Change Lists to HashSets to prevent useless duplicates being added.
MrPurple6411 Nov 20, 2023
8cc7e4d
Correct Timing issue that would remove the items AnalysisTech if the …
MrPurple6411 Nov 20, 2023
7015c18
Reimplement lost functionality removed by my failure to properly revi…
MrPurple6411 Nov 20, 2023
01f2bbc
change require analysistech causing fail to auto create one instead l…
MrPurple6411 Dec 17, 2023
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
Next Next commit
Correct functionality change to SetAnalysisTechEntry
  • Loading branch information
@MrPurple6411
MrPurple6411 committed Nov 20, 2023
commit 629b3a7d5bbb691bd8a4cbe0be10c599cbc447f2
12 changes: 10 additions & 2 deletions Nautilus/Patchers/KnownTechPatcher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,16 @@ private static void InitializePrefix(PDAData data)
}
else
{
InternalLogger.Debug($"Replacing analysisTech for {tech.techType}");
data.analysisTech[index] = tech;
InternalLogger.Debug($"Altering original analysisTech for {tech.techType}");
var existingEntry = data.analysisTech[index];

existingEntry.unlockMessage = tech.unlockMessage ?? existingEntry.unlockMessage;
existingEntry.unlockSound = tech.unlockSound ?? existingEntry.unlockSound;
existingEntry.unlockPopup = tech.unlockPopup ?? existingEntry.unlockPopup;
existingEntry.unlockTechTypes.AddRange(tech.unlockTechTypes);
#if SUBNAUTICA
existingEntry.storyGoals.AddRange(tech.storyGoals);
#endif
}

if (tech.unlockSound == null)
Expand Down