Boats release

Author: smasherprog

EQTool/Models/PlayerInfo.cs

@@ -810,13 +810,21 @@ public bool RunSpeedOverlay
             }
         }
 
-        private bool _BoatSchedule;
-        public bool BoatSchedule
+        private bool? _BoatScheduleR;
+        public bool? BoatScheduleR
         {
-            get => _BoatSchedule;
+            get => _BoatScheduleR == null ? true : _BoatScheduleR.Value;
             set
             {
-                _BoatSchedule = value;
+                if (value == null)
+                {
+                    _BoatScheduleR = true;
+                }
+                else
+                {
+                    _BoatScheduleR = value;
+                }
+
                 OnPropertyChanged();
             }
         }

EQTool/UI/SettingsComponents/SettingsGeneral.xaml

@@ -261,6 +261,13 @@
         <TabItem Header="Triggers">
             <StackPanel Orientation="Vertical" Margin="5, 5, 5, 5">
                 <StackPanel Orientation="Vertical"  Margin="0, 0, 0, 8">
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Text="Boat Schedule"  VerticalAlignment="Center"  FontWeight="Bold"  MinWidth="100"/>
+                        <CheckBox IsChecked="{Binding ActivePlayer.Player.BoatScheduleR}" Click="Savesettings" MinWidth="75"></CheckBox>
+                    </StackPanel>
+                    <DockPanel>
+                        <TextBlock MaxWidth="400" TextWrapping="Wrap" Text="Boat times are constantly being tweaked. More boats will be working soon!" />
+                    </DockPanel>
                     <StackPanel Orientation="Horizontal" ToolTip="This setting will switch to show only spells you care about when raid mode is detected.">
                         <TextBlock Text="Raid Detection" VerticalAlignment="Center"  FontWeight="Bold"  MinWidth="100"/>
                         <CheckBox IsChecked="{Binding RaidModeDetection}" Click="Savesettings"></CheckBox>
@@ -452,14 +459,7 @@
         </TabItem>
 
         <TabItem Header="Experimental">
-            <StackPanel Orientation="Vertical" Margin="5, 5, 5, 5" HorizontalAlignment="Stretch">
-                <StackPanel Orientation="Horizontal">
-                    <TextBlock Text="Boat Schedule"  VerticalAlignment="Center"  FontWeight="Bold"  MinWidth="100"/>
-                    <CheckBox IsChecked="{Binding ActivePlayer.Player.BoatSchedule}" Click="Savesettings" MinWidth="75"></CheckBox>
-                </StackPanel>
-                <DockPanel>
-                    <TextBlock MaxWidth="400" TextWrapping="Wrap" Text="Boat Schedules are NOT currently working. It will be working soon!" />
-                </DockPanel>
+            <StackPanel Orientation="Vertical" Margin="5, 5, 5, 5" HorizontalAlignment="Stretch"> 
                 <StackPanel Orientation="Horizontal">
                     <TextBlock Text="Timer Sharing"  VerticalAlignment="Center"  FontWeight="Bold"  MinWidth="100"/>
                     <CheckBox IsChecked="{Binding ActivePlayer.Player.ShareTimers}" Click="Savesettings" MinWidth="75"></CheckBox>

EQTool/ViewModels/SpellWindowViewModel.cs

@@ -274,7 +274,7 @@ public void UpdateSpells(double dt_ms)
                     item.ColumnVisibility = hidespell ? System.Windows.Visibility.Collapsed : System.Windows.Visibility.Visible;
                 }
 
-                var boats = this._SpellList.Where(a => a.SpellViewModelType == SpellViewModelType.Boat).Cast<BoatViewModel>().ToList();
+                var boats = _SpellList.Where(a => a.SpellViewModelType == SpellViewModelType.Boat).Cast<BoatViewModel>().ToList();
                 foreach (var boat in boats)
                 {
                     if (BoatScheduleService.SupportdBoats.Contains(boat.Boat.Boat))
@@ -287,7 +287,7 @@ public void UpdateSpells(double dt_ms)
                         }
                     }
 
-                    if (player?.BoatSchedule == false)
+                    if (player?.BoatScheduleR == false)
                     {
                         boat.ColumnVisibility = Visibility.Collapsed;
                     }
@@ -522,16 +522,16 @@ public void TryRemoveUnambiguousSpellSelf(List<string> possiblespellnames)
 
         public void UpdateBoats()
         {
-            var s = this.activePlayer.Player.Server;
+            var s = activePlayer.Player.Server;
             if (s.HasValue)
             {
-                var boatsapi = this.pigParseApi.GetBoatData(s.Value);
+                var boatsapi = pigParseApi.GetBoatData(s.Value);
                 appDispatcher.DispatchUI(() =>
                 {
-                    var boats = this._SpellList.Where(a => a.SpellViewModelType == SpellViewModelType.Boat).Cast<BoatViewModel>().ToList();
+                    var boats = _SpellList.Where(a => a.SpellViewModelType == SpellViewModelType.Boat).Cast<BoatViewModel>().ToList();
                     foreach (var boat in boatsapi)
                     {
-                        this.boatScheduleService.UpdateBoatInformation(boat, boats, DateTimeOffset.Now);
+                        boatScheduleService.UpdateBoatInformation(boat, boats, DateTimeOffset.Now);
                     }
                 });
             }

EQToolShared/Zones.cs

@@ -108,7 +108,7 @@ static Zones()
                 StartAnnoucement = "Rack Stonebelly shouts, 'Da Barrel Barge will be here soon soon!'",
                 AnnouncementToDockInSeconds = 119,
                 EndPoint = "timorous",
-                TripTimeInSeconds = 779.25
+                TripTimeInSeconds = 779.75
             });
 
             Boats.Add(new BoatInfo
@@ -119,7 +119,7 @@ static Zones()
                 StartAnnoucement = string.Empty,
                 AnnouncementToDockInSeconds = 510,
                 EndPoint = "oasis",
-                TripTimeInSeconds = 779.25
+                TripTimeInSeconds = 778.75
             });
             Boats.Add(new BoatInfo
             {