Sleep wake config

FF1Blazorizer/FF1Blazorizer.csproj

@@ -13,6 +13,7 @@
 	  <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 	</PropertyGroup>
 
+
 	<ItemGroup>
 		<PackageReference Include="Blazored.LocalStorage" Version="3.0.0" />
 		<PackageReference Include="BlazorStrap" Version="1.3.3" />

FF1Blazorizer/Tabs/AdjustmentsTab.razor

@@ -44,7 +44,8 @@
     <CheckBox UpdateAction="@UpdateAction" Id="dashCheckBox" @bind-Value="Flags.Dash">Faster Walking Speed</CheckBox>
     <CheckBox UpdateAction="@UpdateAction" Id="speedboatCheckBox" @bind-Value="Flags.SpeedBoat">Faster Ship</CheckBox>
 	<CheckBox UpdateAction="@UpdateAction" Id="identifyTreasuresCheckBox" @bind-Value="Flags.IdentifyTreasures">Identify Treasures</CheckBox>
-	<CheckBox UpdateAction="@UpdateAction" Id="buyTenCheckBox" @bind-Value="Flags.BuyTen">Buy Quantity</CheckBox>
+    <CheckBox UpdateAction="@UpdateAction" Id="chestsAppearOpenedCheckBox" @bind-Value="Flags.ChestsAppearOpened">Chests Appear Opened</CheckBox>
+    <CheckBox UpdateAction="@UpdateAction" Id="buyTenCheckBox" @bind-Value="Flags.BuyTen">Buy Quantity</CheckBox>
 	<CheckBox UpdateAction="@UpdateAction" Id="waitWhenUnrunnableCheckBox" @bind-Value="Flags.WaitWhenUnrunnable">Change Unrunnable RUN to WAIT</CheckBox>
 	<CheckBox UpdateAction="@UpdateAction" IsEnabled="@Flags.SpeedHacks" Id="enableCritNumberDisplayCheckBox" @bind-Value="Flags.EnableCritNumberDisplay">Critical Hit Count</CheckBox>
 	<CheckBox UpdateAction="@UpdateAction" Id="battleMagicMenuWrapAroundCheckBox" @bind-Value="Flags.BattleMagicMenuWrapAround">Battle Magic Menu Wrap Around</CheckBox>

FF1Blazorizer/Tabs/ClassesTab.razor

@@ -8,9 +8,9 @@
 		<div class="col1">
 			<h4>Class Balance</h4>
 			<CheckBox UpdateAction="@UpdateAction" IsEnabled="@(Flags.RandomizeClassMode != ClassRandomizationMode.Transmooglifier)" Id="doubleBBCritCheckBox" @bind-Value="Flags.BBCritRate">Halve BB Crit Rate</CheckBox>
-			<CheckBox UpdateAction="@UpdateAction" IsEnabled="@(Flags.RandomizeClassMode != ClassRandomizationMode.Transmooglifier)" Id="thiefHitCheckBox" @bind-Value="Flags.ThiefHitRate">Double Thief &amp; Ninja Hit% Growth</CheckBox>
+			<EnumDropDown UpdateAction="@UpdateAction" IsEnabled="@(Flags.RandomizeClassMode != ClassRandomizationMode.Transmooglifier)" Id="thiefHitDropDown" TItem="ThiefHit" @bind-Value="Flags.ThiefHitBuff">Adjust Thief &amp; Ninja Hit% Growth</EnumDropDown>
+			<EnumDropDown UpdateAction="@UpdateAction" IsEnabled="@(Flags.RandomizeClassMode != ClassRandomizationMode.Transmooglifier)" Id="redMageHitDropDown" TItem="RedMageHit" @bind-Value="Flags.RedMageHitBuff">Adjust Red Mage &amp; Red Wizard Hit% Growth</EnumDropDown>
 			<EnumDropDown UpdateAction="@UpdateAction" IsEnabled="@(Flags.RandomizeClassMode != ClassRandomizationMode.Transmooglifier)" Id="thiefAgilityBuffDropDown" TItem="ThiefAGI" @bind-Value="Flags.ThiefAgilityBuff">Better Thief &amp; Ninja Agility</EnumDropDown>
-			<CheckBox UpdateAction="@UpdateAction" IsEnabled="@(Flags.RandomizeClassMode != ClassRandomizationMode.Transmooglifier)" Id="fixHitChanceCapCheckBox" @bind-Value="Flags.FixHitChanceCap">Raise Hit % Cap</CheckBox>
 			<EnumDropDown UpdateAction="@UpdateAction" IsEnabled="@(Flags.RandomizeClassMode != ClassRandomizationMode.Transmooglifier)" Id="MDefModeDropDown" TItem="MDEFGrowthMode" @bind-Value="Flags.MDefMode">MDEF Growth:</EnumDropDown>
 			<CheckBox UpdateAction="@UpdateAction" Id="WhiteMageHarmEveryoneCheckBox" @bind-Value="Flags.WhiteMageHarmEveryone">Improved HARM for White Mage</CheckBox>
 			<TriStateCheckBox UpdateAction="@UpdateAction" Id="Lockpicking" @bind-Value="Flags.Lockpicking">Thief Lockpicking</TriStateCheckBox>

FF1Blazorizer/Tabs/DungeonsTab.razor

@@ -25,11 +25,10 @@
 		<TriStateCheckBox UpdateAction="@UpdateAction" Id="dragonsHoardCheckBox" @bind-Value="Flags.MapDragonsHoard">Bahamut's Hoard</TriStateCheckBox>
 		<TriStateCheckBox UpdateAction="@UpdateAction" Id="hallOfDragonsCheckBox" @bind-Value="Flags.MapHallOfDragons">Hall of Dragons</TriStateCheckBox>
 		<TriStateCheckBox UpdateAction="@UpdateAction" Id="mermaidPrison" @bind-Value="Flags.MermaidPrison">Mermaid Prison</TriStateCheckBox>
-		<CheckBox UpdateAction="@UpdateAction" Id="procGenWaterfall" @bind-Value="Flags.EFGWaterfall">Generated Waterfall Cave</CheckBox>
 		<div class="checkbox-cell"></div>
 		<TriStateCheckBox UpdateAction="@UpdateAction" Id="flipDungeonsCheckBox" @bind-Value="Flags.FlipDungeons">Flip Dungeons Horizontally</TriStateCheckBox>
 		<TriStateCheckBox UpdateAction="@UpdateAction" Id="verticallyFlipDungeons" IsEnabled="@(Flags.GameMode == GameModes.Standard)" @bind-Value="Flags.VerticallyFlipDungeons">Flip Dungeons Vertically</TriStateCheckBox>
-		<TriStateCheckBox UpdateAction="@UpdateAction" Id="reversedFloors" @bind-Value="Flags.ReversedFloors">Swap Stair Locations</TriStateCheckBox>
+		<TriStateCheckBox UpdateAction="@UpdateAction" Id="reversedFloors" IsEnabled="@(Flags.GameMode == GameModes.Standard)" @bind-Value="Flags.ReversedFloors">Swap Stair Locations</TriStateCheckBox>
 		<div class="checkbox-cell"></div>
 		<TriStateCheckBox UpdateAction="@UpdateAction" Id="relocateChests" @bind-Value="Flags.RelocateChests">Relocate Chests and Trap Tiles</TriStateCheckBox>
 		<CheckBox Indent UpdateAction="@UpdateAction" Id="markRelocatedTrapTiles" @bind-Value="Flags.RelocateChestsTrapIndicator" IsEnabled="@(Flags.RelocateChests != false)">Relocated Trap Tiles Are Marked</CheckBox>
@@ -48,6 +47,7 @@
 		<TriStateCheckBox UpdateAction="@UpdateAction" Id="confusedOldMenCheckBox" @bind-Value="Flags.ConfusedOldMen">Confused Old Men</TriStateCheckBox>
 		<TriStateCheckBox UpdateAction="@UpdateAction" Id="gaiaShortcutCheckBox" @bind-Value="Flags.GaiaShortcut">Add Gaia Shortcut</TriStateCheckBox>
 		<TriStateCheckBox UpdateAction="@UpdateAction" Indent Id="moveGaiaItemShopCheckBox" IsEnabled="@(Flags.GaiaShortcut != false)" @bind-Value="Flags.MoveGaiaItemShop">Move Gaia Item Shop</TriStateCheckBox>
+            <TriStateCheckBox UpdateAction="@UpdateAction" Id="lefeinShortcutCheckBox" @bind-Value="Flags.LefeinShortcut">Add Lefien Shortcut</TriStateCheckBox>
 		<TriStateCheckBox UpdateAction="@UpdateAction" Id="lefeinShopsCheckBox" @bind-Value="Flags.LefeinShops">Lefeinish Hospitality</TriStateCheckBox>
 		<TriStateCheckBox UpdateAction="@UpdateAction" Id="lefeinSuperStoreCheckBox" IsEnabled="@Flags.LefeinSuperStoreEnabled" @bind-Value="Flags.LefeinSuperStore">Add Lefein SuperStore</TriStateCheckBox>
 		<TriStateCheckBox UpdateAction="@UpdateAction" Id="shufflePravokaShopsCheckBox" @bind-Value="Flags.ShufflePravokaShops">Shuffle Pravoka's Shops</TriStateCheckBox>

FF1Blazorizer/Tabs/EnemiesTab.razor

@@ -20,7 +20,9 @@
             <TriStateCheckBox UpdateAction="@UpdateAction" Id="bossRemoveBossScripts" @bind-Value="Flags.RemoveBossScripts">Remove Boss Scripts</TriStateCheckBox>
             <TriStateCheckBox UpdateAction="@UpdateAction" Id="bossScriptsCheckBox" IsEnabled="@(Flags.RemoveBossScripts == false)" @bind-Value="Flags.ShuffleScriptsBosses">Shuffle Scripts</TriStateCheckBox>
 			<TriStateCheckBox UpdateAction="@UpdateAction" Id="bossSkillsSpellsCheckBox" IsEnabled="@(Flags.RemoveBossScripts == false)" @bind-Value="Flags.ShuffleSkillsSpellsBosses">Shuffle Skills & Spells</TriStateCheckBox>
-			<TriStateCheckBox UpdateAction="@UpdateAction" Indent IsEnabled="@(Flags.ShuffleSkillsSpellsBosses != false)" Id="noConsecutiveNukesCheckBox" @bind-Value="Flags.NoConsecutiveNukes">No Consecutive NUKE or NUCLEAR</TriStateCheckBox>
+            <TriStateCheckBox UpdateAction="@UpdateAction" Indent Id="templeoffiendrefightsonlyCheckBox" IsEnabled="@(Flags.ShuffleSkillsSpellsBosses)" @bind-Value="Flags.TempleOfFiendRefightsOnly">Temple Of Fiends Only</TriStateCheckBox>
+            <TriStateCheckBox UpdateAction="@UpdateAction" Indent Id="overworldfiendsonlyCheckBox" IsEnabled="@(Flags.ShuffleSkillsSpellsBosses)" @bind-Value="Flags.OverworldFiendsOnly">Overworld Fiends Only</TriStateCheckBox>
+            <TriStateCheckBox UpdateAction="@UpdateAction" Indent IsEnabled="@(Flags.ShuffleSkillsSpellsBosses != false)" Id="noConsecutiveNukesCheckBox" @bind-Value="Flags.NoConsecutiveNukes">No Consecutive NUKE or NUCLEAR</TriStateCheckBox>
 
 
 			<div class="checkbox-cell"></div>
@@ -68,7 +70,8 @@
 			<TriStateCheckBox UpdateAction="@UpdateAction" Indent Id="finalfantasy4pool" [email protected] @bind-Value="Flags.FinalFantasy4Fiends">Final Fantasy 4</TriStateCheckBox>
             <TriStateCheckBox UpdateAction="@UpdateAction" Indent Id="finalfantasy5pool" [email protected] @bind-Value="Flags.FinalFantasy5Fiends">Final Fantasy 5</TriStateCheckBox>
             <TriStateCheckBox UpdateAction="@UpdateAction" Indent Id="finalfantasy6pool" [email protected] @bind-Value="Flags.FinalFantasy6Fiends">Final Fantasy 6</TriStateCheckBox>
-				<TriStateCheckBox UpdateAction="@UpdateAction" Indent Id="blackorbrisingpool" [email protected] @bind-Value="Flags.BlackOrbFiends">Black Orb Rising</TriStateCheckBox>
+             <TriStateCheckBox UpdateAction="@UpdateAction" Indent Id="winnerscirclepool" [email protected] @bind-Value="Flags.WinnerCircleFiends">Winners Circle</TriStateCheckBox>
+			<TriStateCheckBox UpdateAction="@UpdateAction" Indent Id="blackorbrisingpool" [email protected] @bind-Value="Flags.BlackOrbFiends">Black Orb Rising</TriStateCheckBox>
 			<div class="checkbox-cell"></div>
 
 			<h4>Bahamut</h4>

FF1Blazorizer/Tabs/FileTab.razor

@@ -31,6 +31,7 @@
 	<CheckBox UpdateAction="@UpdateAction" Id="tournamentSafeCheckBox" @bind-Value="Flags.TournamentSafe">Tournament Safe ROM</CheckBox>
 	<CheckBox UpdateAction="@UpdateAction" Id="spoilersCheckBox" @bind-Value="Flags.Spoilers">Generate Spoiler Log!</CheckBox>
 	<CheckBox UpdateAction="@UpdateAction" Id="printBlursingsCheckBox" @bind-Value="Preferences.PrintBlursings">Print Class Blursings</CheckBox>
+	<CheckBox UpdateAction="@UpdateAction" Id="tristatesCheckBox" @bind-Value="Flags.TriState">Show Reveal Randomized State Flags Button</CheckBox>
 	<CheckBox UpdateAction="@UpdateAction" Id="blindseedCheckBox" IsEnabled="@(!Flags.BlindSeed)" @bind-Value="Flags.BlindSeed">Hide Flags</CheckBox>
 	<p>
 		Seed:
@@ -57,6 +58,7 @@
 
 	<p>@((MarkupString)StatusMessage)</p>
 	<div class="row">&nbsp;</div>
+	<a class="styled-button generate-button" hidden="@(!Flags.TriState)" disabled="@(!Flags.TriState)" style="font-size: small; margin-bottom: 10px;" @onclick="@CollapseTriStates">Reveal Randomized State Flags</a>
 	<a class="styled-button generate-button" @onclick="@OnRandomize">Generate ROM</a>
 </div>
 
@@ -242,6 +244,30 @@
 		UpdateAction?.Invoke("UpdateFlagstring","");
 	}
 
+	public void CollapseTriStates() {
+		if (_fileData == null)
+		{
+			SetStatusMessage("Reveal Failed: No ROM File Selected!");
+			StateHasChanged();
+			return;
+		}
+
+		//All of this is needed to convert the tristate flags.
+		//A better way would probably be to pull the rng initialization out of the rom class.
+		//Update it as flags/seed change then give it back to rom during seed gen.
+		using (var stream = new MemoryStream(_fileData))
+		{
+			_rom = new FF1Rom(stream);
+		}
+		Flags flagsForRng = Flags.ShallowCopy();
+		_rom.GenerateRng(flagsForRng, Blob.FromHex(_seed));
+		Flags = FF1Lib.Flags.ConvertAllTriState(flagsForRng, FF1Lib.FF1Rom.rng);
+
+		//Reloads page with new flags
+		//Surely there's a better way to do this
+		NavigationManager.NavigateTo(NavigationManager.BaseUri + "?s=" + _seed + "&f=" + Flags.Encoded, true);
+	}
+
 	async Task OnRandomize(MouseEventArgs e)
 	{
 		if (_fileData == null)
@@ -321,14 +347,22 @@
 		try
 		{
 			Utilities.SpoilerCache = string.Empty;
+			Utilities.FlagCache = string.Empty;
 
 			_rom.ProgressCallback = this.Progress;
 
 			this.warnings = "";
 			SetModalContent("");
 			ShowModal(true);
 			SetGenerating(true);
-			await _rom.Randomize(seed, Flags, Preferences);
+
+			Flags tempFlags = await _rom.Randomize(seed, Flags, Preferences);
+
+			if (Flags.TriState){
+				Flags = tempFlags;
+				Flagstring = Flags.Encoded;
+			}
+
 			string BlursingsText = "<details><summary>Class Blursings:</summary><p>" + ("\n\n" + _rom.SpoilBlursings())
 				.Replace("\n\nFighter", "<br><br><b>Fighter</b>")
 				.Replace("\n\nThief", "<br><br><b>Thief</b>")
@@ -368,7 +402,6 @@
 
 			await JSRuntime.InvokeAsync<object>("downloadFile", $"FFR_{_seed}_{_rom.GetHash()}.nes", encoded);
 
-
 			if(Flags.Spoilers && Utilities.SpoilerCache.Length > 0)
 			{
 				var encodedSpoiler = Convert.ToBase64String(System.Text.Encoding.UTF8.GetBytes(Utilities.SpoilerCache));
@@ -393,6 +426,7 @@
 			SetModalContent(modalContent + "<br>" + StatusMessage);
 			SetGenerating(false);
 		}
+
 		StateHasChanged();
 	}
 }

FF1Blazorizer/Tabs/FunTab.razor

@@ -13,6 +13,7 @@
 	<CheckBox UpdateAction="@UpdateAction" Id="changeLuteCheckBox" @bind-Value="Preferences.ChangeLute">Multi-instrumentalist Sara</CheckBox>
 	<EnumDropDown UpdateAction="@UpdateAction" Id="titanSnackDropDown" TItem="TitanSnack" @bind-Value="Preferences.TitanSnack">Titan's Favorite Snack:</EnumDropDown>
 	<EnumDropDown UpdateAction="@UpdateAction" Id="hurrayDwarfFateDropDown" TItem="Fate" @bind-Value="Preferences.HurrayDwarfFate">Hurray Dwarf's Fate:</EnumDropDown>
+    <CheckBox UpdateAction="@UpdateAction" Id="funFountainsCheckBox" @bind-Value="Preferences.FunFountainText">Fun Fountain Text</CheckBox>
 	<CheckBox UpdateAction="@UpdateAction" Id="randomShardNamesCheckBox" @bind-Value="Preferences.randomShardNames">Random Shard Names</CheckBox>
 	<CheckBox UpdateAction="@UpdateAction" Id="paletteSwapCheckBox" @bind-Value="Preferences.PaletteSwap">Palette Swap</CheckBox>
 	<CheckBox UpdateAction="@UpdateAction" Id="modernBattlefieldCheckBox" @bind-Value="Preferences.ModernBattlefield">Modern Battlefield</CheckBox>

FF1Blazorizer/Tabs/GoalTab.razor

@@ -14,7 +14,12 @@
 	<div class="checkbox-cell"></div>
 	<h4>Temple of Fiends</h4>
 	<EnumDropDown UpdateAction="@UpdateAction" Id="tofrModeDropDown" TItem="ToFRMode" @bind-Value="Flags.ToFRMode">Mode</EnumDropDown>
-	<EnumDropDown UpdateAction="@UpdateAction" Id="fiendsRefightsDropDown" TItem="FiendsRefights" @bind-Value="Flags.FiendsRefights">Fiends Refights</EnumDropDown>
+	@if (Flags.ToFRMode == ToFRMode.Short)
+	{
+		<EnumDropDown UpdateAction="@UpdateAction" Id="shortToFRFiendsRefightsDropDown" TItem="ShortToFRFiendsRefights" @bind-Value="Flags.ShortToFRFiendsRefights">Fiends Refights</EnumDropDown>
+	} else {
+		<EnumDropDown UpdateAction="@UpdateAction" Id="fiendsRefightsDropDown" TItem="FiendsRefights" @bind-Value="Flags.FiendsRefights">Fiends Refights</EnumDropDown>
+	}
 	<TriStateCheckBox UpdateAction="@UpdateAction" Id="chaosRushCheckBox" @bind-Value="Flags.ChaosRush">Unlocked ToFR</TriStateCheckBox>
 	<TriStateCheckBox UpdateAction="@UpdateAction" Id="exitToFRCheckBox" @bind-Value="Flags.ExitToFR">Add ToFR Exit</TriStateCheckBox>
 	<TriStateCheckBox UpdateAction="@UpdateAction" Id="chaosFloorEncountersCheckBox" @bind-Value="Flags.ChaosFloorEncounters">Add Chaos Floor Encounters</TriStateCheckBox>

FF1Blazorizer/Tabs/QoLTab.razor

@@ -19,6 +19,7 @@
 	<CheckBox UpdateAction="@UpdateAction" Id="accessibleSpellNamesCheckBox" @bind-Value="Preferences.AccessibleSpellNames">Accessible Spell Names</CheckBox>
 	<CheckBox UpdateAction="@UpdateAction" Id="cleanBlursedEquipmentNamesCheckBox" @bind-Value="Preferences.CleanBlursedEquipmentNames">Cleaner Blursed Names</CheckBox>
 	<CheckBox UpdateAction="@UpdateAction" Id="shopInfoIconsCheckBox" @bind-Value="Preferences.ShopInfoIcons">Shop Information Icons</CheckBox>
+	<CheckBox UpdateAction="@UpdateAction" Id="magicShopMenuCheckBox" @bind-Value="Preferences.MagicShopMenuChange">Magic Shop Menus Match Equipment Shops Menus</CheckBox>
 	<CheckBox UpdateAction="@UpdateAction" Id="cropScreen" @bind-Value="Preferences.CropScreen">Crop Friendly</CheckBox>
 	<CheckBox UpdateAction="@UpdateAction" Id="quickJoy2Reset" @bind-Value="Preferences.QuickJoy2Reset">Quick Controller 2 Reset</CheckBox>
     <div class="checkbox-cell"></div>

FF1Blazorizer/Tabs/ShopsTab.razor

@@ -54,6 +54,9 @@
 			<EnumDropDown UpdateAction="@UpdateAction" Id="magicAutohitThresholdDropDown" TItem="AutohitThreshold" @bind-Value="Flags.MagicAutohitThreshold">Power Word Threshold:</EnumDropDown>
 			<CheckBox UpdateAction="@UpdateAction" Id="enableSoftInBattle" @bind-Value="Flags.EnableSoftInBattle">Enable Soft in Battle</CheckBox>
             <EnumDropDown UpdateAction="@UpdateAction" Id="lifeInBattleDropDown" TItem="LifeInBattleSetting" @bind-Value="Flags.EnableLifeInBattle">Life in Battle:</EnumDropDown>
+			<h5>Sleep</h5>
+			<DoubleSlider DoubleCol DisableTooltip Id="sleepDoubleSlider" UpdateAction="@UpdateAction" MinValue="0" MaxValue="255" Step="1" @bind-ValuesRange="(Flags.PlayerSleepScaleLow,Flags.PlayerSleepScaleHigh)">Player Wake HP RNG Range:</DoubleSlider>
+			@* <DoubleSlider DoubleCol DisableTooltip Id="sleepDoubleSlider" UpdateAction="@UpdateAction" MinValue="0" MaxValue="255" Step="1" @bind-ValuesRange="(Flags.EnemySleepScaleLow,Flags.EnemySleepScaleHigh)">Enemy Wake HP RNG Range:</DoubleSlider> *@
 
 			<div class="checkbox-cell"></div>
 			<h4>Spell Crafter</h4>

FF1Blazorizer/Tabs/TreasuresTab.razor

@@ -36,7 +36,7 @@
 	<CheckBox UpdateAction="@UpdateAction" Id="tcExcludeCommonCheckBox" @bind-Value="Flags.TCExcludeCommons">Exclude Common Treasures</CheckBox>
 	<CheckBox UpdateAction="@UpdateAction" Id="tcProtectIncentivesCheckBox" @bind-Value="Flags.TCProtectIncentives">Exclude Incentivized Items</CheckBox>
 	<TriStateCheckBox UpdateAction="@UpdateAction" Id="trappedMarkCheckBox" @bind-Value="Flags.TCIndicator">Trapped Chests are Marked</TriStateCheckBox>
-	<div class="checkbox-cell"></div>
+	<div class="checkbox-cell"></div>
 </div>
 <div class="col2">
 	<h4>Freebies</h4>