Merge beta into main
This commit is contained in:
@@ -30,7 +30,7 @@
|
|||||||
public EntryRequirement CrystalsGanon { get; set; } = EntryRequirement.Crystals7;
|
public EntryRequirement CrystalsGanon { get; set; } = EntryRequirement.Crystals7;
|
||||||
|
|
||||||
[SettingName("bosses_ganon")]
|
[SettingName("bosses_ganon")]
|
||||||
[IgnoreSetting(Apr2025, Base)]
|
[IgnoreSetting(Apr2025)]
|
||||||
public BossRequirement BossesGanon { get; set; } = BossRequirement.Bosses8of10;
|
public BossRequirement BossesGanon { get; set; } = BossRequirement.Bosses8of10;
|
||||||
|
|
||||||
[NoSettingName]
|
[NoSettingName]
|
||||||
@@ -92,11 +92,11 @@
|
|||||||
public DungeonItemLocations Compasses { get; set; } = DungeonItemLocations.Dungeon;
|
public DungeonItemLocations Compasses { get; set; } = DungeonItemLocations.Dungeon;
|
||||||
|
|
||||||
[SettingName("showloot")]
|
[SettingName("showloot")]
|
||||||
[IgnoreSetting(Apr2025, Base)]
|
[IgnoreSetting(Apr2025)]
|
||||||
public ShowLoot ShowLoot { get; set; } = ShowLoot.Never;
|
public ShowLoot ShowLoot { get; set; } = ShowLoot.Never;
|
||||||
|
|
||||||
[SettingName("showmap")]
|
[SettingName("showmap")]
|
||||||
[IgnoreSetting(Apr2025, Base)]
|
[IgnoreSetting(Apr2025)]
|
||||||
public ShowMap ShowMap { get; set; } = ShowMap.Map;
|
public ShowMap ShowMap { get; set; } = ShowMap.Map;
|
||||||
|
|
||||||
[NoSettingName]
|
[NoSettingName]
|
||||||
@@ -174,7 +174,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public enum RandomizerInstance {
|
public enum RandomizerInstance {
|
||||||
[GeneratorSettings("base", "OR_", "--bps", "--spoiler=json")] Base,
|
[GeneratorSettings("base", "GK_", "--bps", "--spoiler=json")] Base,
|
||||||
[GeneratorSettings("beta", "GK_", "--bps", "--spoiler=json")] Beta,
|
[GeneratorSettings("beta", "GK_", "--bps", "--spoiler=json")] Beta,
|
||||||
[GeneratorSettings("apr2025", "ER_", requireFlips: true, "--json_spoiler")] Apr2025,
|
[GeneratorSettings("apr2025", "ER_", requireFlips: true, "--json_spoiler")] Apr2025,
|
||||||
}
|
}
|
||||||
@@ -294,7 +294,7 @@
|
|||||||
[SettingName("original")] Default,
|
[SettingName("original")] Default,
|
||||||
[SettingName("restricted")] VanillaDrops,
|
[SettingName("restricted")] VanillaDrops,
|
||||||
Loose,
|
Loose,
|
||||||
[SettingName("follow_linked")] Chaos,
|
[SettingName("followlinked")] Chaos,
|
||||||
}
|
}
|
||||||
|
|
||||||
public enum LinkedDrops {
|
public enum LinkedDrops {
|
||||||
|
|||||||
Submodule BaseRandomizer updated: ec81a900ef...f539e24ddb
Submodule BetaRandomizer updated: a019fa6478...4468721621
Reference in New Issue
Block a user