Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 9 additions & 9 deletions src/TrackerCouncil.Smz3.Data/WorldData/World.cs
Original file line number Diff line number Diff line change
Expand Up @@ -330,12 +330,15 @@ public void UpdateLegacyWorld(TrackerState? trackerState)
return;
}

var hasAllMedallions = trackerState?.ItemStates.Count(x =>
x.Type is ItemType.Quake or ItemType.Ether or ItemType.Bombos && x.TrackingState > 0) == 3;

var worldState = new LegacyWorldState()
{
Medallions =
[
GetLegacyMedallion(MiseryMire),
GetLegacyMedallion(TurtleRock)
GetLegacyMedallion(MiseryMire, hasAllMedallions),
GetLegacyMedallion(TurtleRock, hasAllMedallions)
],
Rewards =
[
Expand Down Expand Up @@ -380,19 +383,16 @@ private LegacyRewardType GetLegacyRewardType(IHasReward region)
};
}

private LegacyWorldState.LegacyMedallion GetLegacyMedallion(IHasPrerequisite region)
private LegacyWorldState.LegacyMedallion GetLegacyMedallion(IHasPrerequisite region, bool hasAllMedallions)
{
var unobtainedMedallion = AllItems.FirstOrDefault(x =>
x.IsLocalPlayerItem && x.Type.IsInCategory(ItemCategory.Medallion) && x.TrackingState == 0)?.Type;

var requiredItemType =
region.MarkedItem ?? unobtainedMedallion ?? region.RequiredItem;
var requiredItemType = hasAllMedallions ? region.RequiredItem : region.MarkedItem ?? ItemType.Nothing;

return requiredItemType switch
{
ItemType.Bombos => LegacyWorldState.LegacyMedallion.Bombos,
ItemType.Ether => LegacyWorldState.LegacyMedallion.Ether,
_ => LegacyWorldState.LegacyMedallion.Bombos
ItemType.Quake => LegacyWorldState.LegacyMedallion.Quake,
_ => LegacyWorldState.LegacyMedallion.Unknown
};
}

Expand Down
1 change: 1 addition & 0 deletions src/TrackerCouncil.Smz3.LegacyLogic/LegacyWorldState.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ namespace Randomizer.SMZ3 {
public class LegacyWorldState {

public enum LegacyMedallion {
Unknown,
Bombos,
Ether,
Quake,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ public LegacyMiseryMire(LegacyWorld legacyWorld, LegacyConfig legacyConfig) : ba

// Need "CanKillManyEnemies" if implementing swordless
public override bool CanEnter(LegacyProgression items) {
if (LegacyMedallion == LegacyMedallion.Unknown && (!items.Bombos || !items.Ether || !items.Quake))
{
return false;
}

return LegacyMedallion switch {
LegacyMedallion.Bombos => items.Bombos,
LegacyMedallion.Ether => items.Ether,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@ bool CanBeatBoss(LegacyProgression items) {
}

public override bool CanEnter(LegacyProgression items) {
if (LegacyMedallion == LegacyMedallion.Unknown && (!items.Bombos || !items.Ether || !items.Quake))
{
return false;
}

return LegacyMedallion switch {
LegacyMedallion.Bombos => items.Bombos,
LegacyMedallion.Ether => items.Ether,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ public void SetDungeonRequirement(IHasPrerequisite region, ItemType? medallion =
Tracker.Say(response: Responses.DungeonRequirementMarked, args: [medallion.ToString(), region.Metadata.Name]);
}

World.UpdateLegacyWorld(World.State);

UpdateAccessibility(region);

AddUndo(autoTracked, () =>
Expand Down