More work

Author: smasherprog

EQTool/Services/BoatScheduleService.cs

@@ -9,6 +9,7 @@ namespace EQTool.Services
 {
     public class BoatScheduleService
     {
+        public static readonly List<Boats> SupportdBoats = new List<Boats>() { Boats.BarrelBarge, Boats.NroIcecladBoat, Boats.BloatedBelly };
         public BoatScheduleService()
         {
 
@@ -32,11 +33,11 @@ public void UpdateBoatInformation(BoatActivityResponce boat, List<BoatViewModel>
             {
                 totalseconds = (int)(dt.TotalSeconds);
             }
-            var workingBoats = new List<Boats>() { Boats.BarrelBarge, Boats.NroIcecladBoat };
-            if (workingBoats.Contains(boat.Boat))
+          
+            if (SupportdBoats.Contains(boat.Boat))
             {
                 var timeToStartDock = startZoneBoat.AnnouncementToDockInSeconds - totalseconds;
-                var timeToEndDock = endZoneBoat.AnnouncementToDockInSeconds - totalseconds;
+       
                 if (timeToStartDock > 0)
                 {
                     startBoat.TotalRemainingDuration = TimeSpan.FromSeconds(timeToStartDock);
@@ -46,14 +47,18 @@ public void UpdateBoatInformation(BoatActivityResponce boat, List<BoatViewModel>
                     timeToStartDock = startZoneBoat.TripTimeInSeconds - totalseconds + startZoneBoat.AnnouncementToDockInSeconds;
                     startBoat.TotalRemainingDuration = TimeSpan.FromSeconds(timeToStartDock);
                 }
-                if (timeToEndDock > 0)
+                if(endBoat!= null)
                 {
-                    endBoat.TotalRemainingDuration = TimeSpan.FromSeconds(timeToEndDock);
-                }
-                else
-                {
-                    timeToEndDock = endZoneBoat.TripTimeInSeconds - totalseconds + endZoneBoat.AnnouncementToDockInSeconds;
-                    endBoat.TotalRemainingDuration = TimeSpan.FromSeconds(timeToEndDock);
+                    var timeToEndDock = endZoneBoat.AnnouncementToDockInSeconds - totalseconds;
+                    if (timeToEndDock > 0)
+                    {
+                        endBoat.TotalRemainingDuration = TimeSpan.FromSeconds(timeToEndDock);
+                    }
+                    else
+                    {
+                        timeToEndDock = endZoneBoat.TripTimeInSeconds - totalseconds + endZoneBoat.AnnouncementToDockInSeconds;
+                        endBoat.TotalRemainingDuration = TimeSpan.FromSeconds(timeToEndDock);
+                    }
                 }
             } 
         }

EQTool/ViewModels/SpellWindowViewModel.cs

@@ -256,11 +256,10 @@ 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 boatslist = new List<Boats>() { Boats.BarrelBarge, Boats.NroIcecladBoat };
+                var boats = this._SpellList.Where(a => a.SpellViewModelType == SpellViewModelType.Boat).Cast<BoatViewModel>().ToList(); 
                 foreach (var boat in boats)
                 { 
-                    if(boatslist.Contains(boat.Boat))
+                    if(BoatScheduleService.SupportdBoats.Contains(boat.Boat))
                     {
                         boat.TotalRemainingDuration = boat.TotalRemainingDuration.Subtract(TimeSpan.FromMilliseconds(dt_ms));
                         if (boat.TotalRemainingDuration.TotalSeconds <= 0)

EQToolShared/Zones.cs

@@ -123,7 +123,8 @@ static Zones()
                 StartPoint = "overthere",
                 StartAnnoucement = "Rack Stonebelly shouts, 'Rack Stonebelly shouts, 'Da Bloated Belly be leaving da Overdere now!'",
                 EndPoint = "timorous",
-                TripTimeInSeconds = 2025
+                TripTimeInSeconds = 2025,
+                AnnouncementToDockInSeconds = 0
             });
 
             Boats.Add(new BoatInfo