Skip to content

Additional AP fixes #681

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

Merged
MattEqualsCoder merged 3 commits into from
Mar 29, 2025
Merged

Additional AP fixes #681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
787a457
Fix other player keys not being counted as dungeon treasure
MattEqualsCoder Mar 29, 2025
d673180
Fix junk comments for potential other game progression items
MattEqualsCoder Mar 29, 2025
df005e3
Fix rom generator spoiling randomized goals
MattEqualsCoder Mar 29, 2025
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
3 changes: 3 additions & 0 deletions src/TrackerCouncil.Smz3.Data/Configuration/ConfigTypes/ItemData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,9 @@ public bool TryGetTrackingResponse(int trackingState, [NotNullWhen(true)] out Sc
/// </remarks>
public bool IsJunk(Config? config)
{
if (InternalItemType == ItemType.OtherGameProgressionItem)
return false;

if (config?.ZeldaKeysanity == true && InternalItemType.IsInAnyCategory(new[] { ItemCategory.SmallKey, ItemCategory.BigKey, ItemCategory.Map }))
return false;

Expand Down
10 changes: 7 additions & 3 deletions src/TrackerCouncil.Smz3.Data/Services/GenerationSettingsWindowService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,9 +501,13 @@ public void UpdateSummaryText()
sb.AppendLine($" - Player Name: {details.Players.First(x => x.IsLocalPlayer).PlayerName}");
sb.AppendLine($" - Player Count: {playerCount}");

sb.AppendLine($" - GT Crystal Count: {details.GanonsTowerCrystalCount}");
sb.AppendLine($" - Ganon Crystal Count: {details.GanonCrystalCount}");
sb.AppendLine($" - Tourian Boss Count: {details.TourianBossCount}");
if (details.RomGenerator == RomGenerator.Mainline)
{
sb.AppendLine($" - GT Crystal Count: {details.GanonsTowerCrystalCount}");
sb.AppendLine($" - Ganon Crystal Count: {details.GanonCrystalCount}");
sb.AppendLine($" - Tourian Boss Count: {details.TourianBossCount}");
sb.AppendLine($" - Open Pyramid: {details.OpenPyarmid}");
}

sb.AppendLine($" - IsMultiworld: {ynResponses[details.IsMultiworld]}");
sb.AppendLine($" - IsHardLogic: {ynResponses[details.IsHardLogic]}");
Expand Down
2 changes: 1 addition & 1 deletion src/TrackerCouncil.Smz3.Data/WorldData/Regions/IHasTreasure.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public int RemainingTreasure
public int GetTreasureCount()
{
var region = (Region)this;
return region.Locations.Count(x => x.Item.Type != ItemType.Nothing && (!x.Item.IsDungeonItem || region.World.Config.ZeldaKeysanity) && x.Type != LocationType.NotInDungeon);
return region.Locations.Count(x => x.Item.Type != ItemType.Nothing && (!x.Item.IsDungeonItem || region.World.Config.ZeldaKeysanity || !x.Item.IsLocalPlayerItem) && x.Type != LocationType.NotInDungeon);
}

public void ApplyState(TrackerState? state)
Expand Down
Loading