Merge pull request #261 from latzio/dev

Entroper · web-flow · commit f5855ae16a3b · 2019-03-10T14:12:01.000-07:00
2.5.1 Softlaunch with Free Canal.
diff --git a/FF1Lib/FF1Rom.cs b/FF1Lib/FF1Rom.cs
@@ -13,7 +13,7 @@ namespace FF1Lib
 	// ReSharper disable once InconsistentNaming
 	public partial class FF1Rom : NesRom
 	{
-		public const string Version = "2.5.0";
+		public const string Version = "2.5.1";
 
 		public const int RngOffset = 0x7F100;
 		public const int BattleRngOffset = 0x7FCF1;
@@ -362,6 +362,11 @@ public void Randomize(Blob seed, Flags flags)
 				EnableFreeOrbs();
 			}
 
+			if (flags.FreeCanal)
+			{
+				EnableFreeCanal();
+			}
+
 			if (flags.NoPartyShuffle)
 			{
 				DisablePartyShuffle();
diff --git a/FF1Lib/Flags.cs b/FF1Lib/Flags.cs
@@ -201,6 +201,8 @@ public class Flags : IIncentiveFlags, IMapEditFlags, IScaleFlags, IFloorShuffleF
 		public bool FreeOrbs { get; set; }
 		[FlagString(Character = FILTHY_CASUALS, FlagBit = 8)]
 		public bool EnableCritNumberDisplay { get; set; }
+		[FlagString(Character = FILTHY_CASUALS, FlagBit = 16)]
+		public bool FreeCanal { get; set; }
 		[FlagString(Character = FILTHY_CASUALS, FlagBit = 32)]
 		public bool EasyMode { get; set; }
 
@@ -391,7 +393,7 @@ public class Flags : IIncentiveFlags, IMapEditFlags, IScaleFlags, IFloorShuffleF
 		public bool IncentivizeCrystal => IncentivizeFetchItems;
 		public bool IncentivizeHerb => IncentivizeFetchItems;
 		public bool IncentivizeKey => true;
-		public bool IncentivizeCanal => !NPCItems || IncentivizeFetchItems; // If Canoe is unshuffled then Canal is Required
+		public bool IncentivizeCanal => !FreeCanal && (!NPCItems || IncentivizeFetchItems); // If Canoe is unshuffled then Canal is Required
 		public bool IncentivizeChime => true;
 		public bool IncentivizeOxyale => true;
 		public bool IncentivizeXcalber => false;
diff --git a/FF1Lib/Interfaces.cs b/FF1Lib/Interfaces.cs
@@ -71,6 +71,7 @@ public interface IItemPlacementFlags : IItemShuffleFlags, IVictoryConditionFlags
 	{
 		bool FreeBridge { get; }
 		bool FreeAirship { get; }
+		bool FreeCanal { get; }
 		bool MapCanalBridge { get; }
 		bool MapConeriaDwarves { get; }
 		bool MapVolcanoIceRiver { get; }
@@ -109,5 +110,8 @@ public interface IVictoryConditionFlags
 		bool OnlyRequireGameIsBeatable { get; }
 		bool ShardHunt { get; }
 		bool ShortToFR { get; }
+		bool FreeBridge { get; }
+		bool FreeAirship { get; }
+		bool FreeCanal { get; }
 	}
 }
diff --git a/FF1Lib/ItemPlacement.cs b/FF1Lib/ItemPlacement.cs
@@ -1,9 +1,9 @@
-﻿using System;
+﻿using RomUtilities;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Linq;
-using RomUtilities;
 
 namespace FF1Lib
 {
@@ -296,6 +296,18 @@ public static bool CheckSanity(List<IRewardSource> treasurePlacements,
 			}
 
 			var currentMapChanges = MapChange.None;
+			if (victoryConditions.FreeBridge)
+			{
+				currentMapChanges |= MapChange.Bridge;
+			}
+			if (victoryConditions.FreeAirship)
+			{
+				currentMapChanges |= MapChange.Airship;
+			}
+			if (victoryConditions.FreeCanal)
+			{
+				currentMapChanges |= MapChange.Canal;
+			}
 
 			IEnumerable<MapLocation> currentMapLocations()
 			{
diff --git a/FF1Lib/OverworldMap.cs b/FF1Lib/OverworldMap.cs
@@ -303,7 +303,7 @@ public void ShuffleEntrancesAndFloors(MT19337 rng, IFloorShuffleFlags flags)
 			};
 
 			// Disable the Princess Warp back to Castle Coneria
-			_rom.Put(0x392CA, Blob.FromHex("EAEAEA"));
+			if (flags.Entrances || flags.Floors) _rom.Put(0x392CA, Blob.FromHex("EAEAEA"));
 
 			// Since we're going to move all the entrances around, we're going to change the requirements
 			// for just about everything. Most interestingly the Titan's Tunnel is going to connect totally
diff --git a/FF1Lib/Treasure.cs b/FF1Lib/Treasure.cs
@@ -75,6 +75,10 @@ public List<IRewardSource> ShuffleTreasures(MT19337 rng,
 			{
 				placedItems = placedItems.Select(x => x.Item != Item.Floater ? x : ItemPlacement.NewItemPlacement(x, ReplacementItem)).ToList();
 			}
+			if (flags.FreeCanal)
+			{
+				placedItems = placedItems.Select(x => x.Item != Item.Canal ? x : ItemPlacement.NewItemPlacement(x, ReplacementItem)).ToList();
+			}
 			if (flags.ShortToFR)
 			{
 				placedItems = placedItems.Select(x => x.Item != Item.Lute ? x : ItemPlacement.NewItemPlacement(x, ReplacementItem)).ToList();
diff --git a/FF1Lib/ViewModelFlags.cs b/FF1Lib/ViewModelFlags.cs
@@ -716,6 +716,15 @@ public bool FreeOrbs
 				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs("FreeOrbs"));
 			}
 		}
+		public bool FreeCanal
+		{
+			get => Flags.FreeCanal;
+			set
+			{
+				Flags.FreeCanal = value;
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs("FreeCanal"));
+			}
+		}
 
 		public bool FreeOrbsEnabled => !ShardHunt;
 
diff --git a/FF1Lib/presets/beginner.json b/FF1Lib/presets/beginner.json
@@ -89,6 +89,7 @@
 
 		"FreeBridge": true,
 		"FreeAirship": false,
+		"FreeCanal": false,
 		"FreeOrbs": false,
 		"StartingGold": false,
 		"WrapStatOverflow": false,
diff --git a/FF1Lib/presets/debug.json b/FF1Lib/presets/debug.json
@@ -89,6 +89,7 @@
 
 		"FreeBridge": false,
 		"FreeAirship": false,
+		"FreeCanal": false,
 		"FreeOrbs": false,
 		"StartingGold": false,
 		"WrapStatOverflow": false,
diff --git a/FF1Lib/presets/default.json b/FF1Lib/presets/default.json
@@ -89,6 +89,7 @@
 
 		"FreeBridge": false,
 		"FreeAirship": false,
+		"FreeCanal": false,
 		"FreeOrbs": false,
 		"StartingGold": false,
 		"WrapStatOverflow": false,
diff --git a/FF1Lib/presets/full-npc.json b/FF1Lib/presets/full-npc.json
@@ -89,6 +89,7 @@
 
 		"FreeBridge": false,
 		"FreeAirship": false,
+		"FreeCanal": false,
 		"FreeOrbs": false,
 		"StartingGold": false,
 		"WrapStatOverflow": false,
diff --git a/FF1Lib/presets/improved-vanilla.json b/FF1Lib/presets/improved-vanilla.json
@@ -89,6 +89,7 @@
 
 		"FreeBridge": false,
 		"FreeAirship": false,
+		"FreeCanal": false,
 		"FreeOrbs": false,
 		"StartingGold": false,
 		"WrapStatOverflow": false,
diff --git a/FF1Randomizer/MainWindow.xaml b/FF1Randomizer/MainWindow.xaml
@@ -345,6 +345,7 @@
 					<StackPanel Orientation="Vertical" Grid.Column="1">
 						<CheckBox x:Name="FreeAirshipCheckBox" IsChecked="{Binding Flags.FreeAirship}" Content="Free Airship" ToolTip="The Airship is available at the start of the game"/>
 						<CheckBox x:Name="FreeBridgeCheckBox" IsChecked="{Binding Flags.FreeBridge}" Content="Free Bridge" ToolTip="The Bridge is available at the start of the game"/>
+						<CheckBox x:Name="FreeCanalCheckBox" IsChecked="{Binding Flags.FreeCanal}" Content="Free Canal" ToolTip="The Canal is available at the start of the game"/>
 						<CheckBox x:Name="EasyModeCheckBox" IsChecked="{Binding Flags.EasyMode}" Content="Easy Mode" ToolTip="Encounter rate cut to 20% and all Enemy HP cut to 10% (after any randomizations)"/>
 					</StackPanel>
 				</Grid>
diff --git a/FF1RandomizerOnline/Views/Home/Index.cshtml b/FF1RandomizerOnline/Views/Home/Index.cshtml
@@ -1,5 +1,8 @@
 ﻿<h1>Welcome!</h1>
-Join the <a href="https://discord.gg/pERvC56">Discord!</a><br />
+<p>&nbsp;</p>
+Join the <a href="https://discord.gg/pERvC56">Final Fantasy 1 Randomizer &amp; Tournament Discord!</a><br />
+Join the <a href="https://discord.gg/p5MdYue">FF1 Randomizer Community Center Discord</a><br />
+Join the <a href="https://discord.gg/s7CRejk">FFR Developer's Discord</a><br />
+<p>&nbsp;</p>
 See <a href="/Home/WhatsNew">What's New!</a><br />
-Check out the <a href="https://sites.google.com/view/ffrleague-season2">FFR League Season 2: Le Tour De Coneria!</a><br />
 Or <a href="/Home/Randomize">Generate</a> a randomized ROM!<br />
diff --git a/FF1RandomizerOnline/Views/Home/Randomize.cshtml b/FF1RandomizerOnline/Views/Home/Randomize.cshtml
@@ -394,6 +394,7 @@
 				<div class="col-xs-4">
 					<div class="checkbox-cell" title="The Airship is available at the start of the game"><input v-model="FreeAirship" type="checkbox" asp-for="Flags.FreeAirship" /> <label asp-for="Flags.FreeAirship">Free Airship</label></div>
 					<div class="checkbox-cell" title="The Bridge is available at the start of the game"><input v-model="FreeBridge" type="checkbox" asp-for="Flags.FreeBridge" /> <label asp-for="Flags.FreeBridge">Free Bridge</label></div>
+					<div class="checkbox-cell" title="The Canal is available at the start of the game"><input v-model="FreeCanal" type="checkbox" asp-for="Flags.FreeCanal" /> <label asp-for="Flags.FreeCanal">Free Canal</label></div>
 					<div class="checkbox-cell" title="Encounter rate cut to 20% and all Enemy HP cut to 10% (after any randomizations)"><input v-model="EasyMode" type="checkbox" asp-for="Flags.EasyMode" /> <label asp-for="Flags.EasyMode">Easy Mode</label></div>
 				</div>
 			</div>
diff --git a/FF1RandomizerOnline/Views/Home/WhatsNew.cshtml b/FF1RandomizerOnline/Views/Home/WhatsNew.cshtml
@@ -1,4 +1,9 @@
 ﻿<div class="col-xs-12">
+	<h1>Version 2.5.1</h1>
+	<h2>Minor Features &amp; Other Changes</h2>
+	<ul>
+		<li>Added Free Canal Convenience.</li>
+	</ul>
 	<h1>Version 2.5.0</h1>
 	<h2>Major Features</h2>
 	<ul>

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ namespace FF1Lib`
`13`	`13`	`// ReSharper disable once InconsistentNaming`
`14`	`14`	`public partial class FF1Rom : NesRom`
`15`	`15`	`{`
`16`		`- public const string Version = "2.5.0";`
	`16`	`+ public const string Version = "2.5.1";`
`17`	`17`
`18`	`18`	`public const int RngOffset = 0x7F100;`
`19`	`19`	`public const int BattleRngOffset = 0x7FCF1;`
`@@ -362,6 +362,11 @@ public void Randomize(Blob seed, Flags flags)`
`362`	`362`	`EnableFreeOrbs();`
`363`	`363`	`}`
`364`	`364`
	`365`	`+ if (flags.FreeCanal)`
	`366`	`+ {`
	`367`	`+ EnableFreeCanal();`
	`368`	`+ }`
	`369`	`+`
`365`	`370`	`if (flags.NoPartyShuffle)`
`366`	`371`	`{`
`367`	`372`	`DisablePartyShuffle();`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ public interface IItemPlacementFlags : IItemShuffleFlags, IVictoryConditionFlags`
`71`	`71`	`{`
`72`	`72`	`bool FreeBridge { get; }`
`73`	`73`	`bool FreeAirship { get; }`
	`74`	`+ bool FreeCanal { get; }`
`74`	`75`	`bool MapCanalBridge { get; }`
`75`	`76`	`bool MapConeriaDwarves { get; }`
`76`	`77`	`bool MapVolcanoIceRiver { get; }`
`@@ -109,5 +110,8 @@ public interface IVictoryConditionFlags`
`109`	`110`	`bool OnlyRequireGameIsBeatable { get; }`
`110`	`111`	`bool ShardHunt { get; }`
`111`	`112`	`bool ShortToFR { get; }`
	`113`	`+ bool FreeBridge { get; }`
	`114`	`+ bool FreeAirship { get; }`
	`115`	`+ bool FreeCanal { get; }`
`112`	`116`	`}`
`113`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,10 @@ public List<IRewardSource> ShuffleTreasures(MT19337 rng,`
`75`	`75`	`{`
`76`	`76`	`placedItems = placedItems.Select(x => x.Item != Item.Floater ? x : ItemPlacement.NewItemPlacement(x, ReplacementItem)).ToList();`
`77`	`77`	`}`
	`78`	`+ if (flags.FreeCanal)`
	`79`	`+ {`
	`80`	`+ placedItems = placedItems.Select(x => x.Item != Item.Canal ? x : ItemPlacement.NewItemPlacement(x, ReplacementItem)).ToList();`
	`81`	`+ }`
`78`	`82`	`if (flags.ShortToFR)`
`79`	`83`	`{`
`80`	`84`	`placedItems = placedItems.Select(x => x.Item != Item.Lute ? x : ItemPlacement.NewItemPlacement(x, ReplacementItem)).ToList();`
Original file line number	Diff line number	Diff line change
`@@ -716,6 +716,15 @@ public bool FreeOrbs`
`716`	`716`	`PropertyChanged?.Invoke(this, new PropertyChangedEventArgs("FreeOrbs"));`
`717`	`717`	`}`
`718`	`718`	`}`
	`719`	`+ public bool FreeCanal`
	`720`	`+ {`
	`721`	`+ get => Flags.FreeCanal;`
	`722`	`+ set`
	`723`	`+ {`
	`724`	`+ Flags.FreeCanal = value;`
	`725`	`+ PropertyChanged?.Invoke(this, new PropertyChangedEventArgs("FreeCanal"));`
	`726`	`+ }`
	`727`	`+ }`
`719`	`728`
`720`	`729`	`public bool FreeOrbsEnabled => !ShardHunt;`
`721`	`730`