Changeset 9

Timestamp:

Mar 26, 2015, 9:06:17 PM (9 years ago)

Author:

chronos

Message:

• Fixed: Allow train to go in round if track is circular.
• Added: Add new train each week.

File:

• trunk/UEngine.pas (modified) (26 diffs)

trunk/UEngine.pas

@@ -40 +40 @@
   end;
 
+  TTrackPoint = record
+    StationIndex: Integer;
+    Point: TPoint;
+  end;
+
   { TMetroLine }
 
@@ -47 +52 @@
     Stations: TMetroStations;
     Trains: TMetroTrains;
-    TrackPoints: array of TPoint;
+    TrackPoints: array of TTrackPoint;
     procedure ConnectStation(Station: TMetroStation);
     procedure DisconnectStation(Station: TMetroStation);
-    procedure AddTrack(P1, P2: TPoint);
+    procedure AddTrack(P1, P2: TPoint; StationIndex: Integer);
     function GetTrackLength: Integer;
-    function GetStationTrackPos(Station: TMetroStation): Integer;
+    function GetStationTrackPos(StationIndex: Integer): Integer;
     constructor Create;
     destructor Destroy; override;
@@ -70 +75 @@
   private
     LastPosDelta: Integer;
+    function GetTargetStation: TMetroStation;
   public
     Passengers: TMetroPassengers;
@@ -77 +83 @@
     InStation: Boolean;
     StationStopTime: TDateTime;
-    TargetStation: TMetroStation;
-    function GetPos: TPoint;
+    TargetStationIndex: Integer;
+    function GetPosition: TPoint;
     constructor Create;
     destructor Destroy; override;
+    property TargetStation: TMetroStation read GetTargetStation;
   end;
 
@@ -88 +95 @@
     function GetUnusedTrain: TMetroTrain;
     function GetUnusedCount: Integer;
+    function AddNew: TMetroTrain;
   end;
 
@@ -123 +131 @@
     LastNewStationTime: TDateTime;
     LastNewPassengerTime: TDateTime;
+    LastNewWeekTime: TDateTime;
     ImagePassenger: TImage;
     ImageLocomotive: TImage;
@@ -211 +220 @@
 end;
 
+function TMetroTrains.AddNew: TMetroTrain;
+begin
+  Result := TMetroTrain.Create;
+  Add(Result);
+end;
+
 { TMetroStations }
 
@@ -264 +279 @@
 var
   Train: TMetroTrain;
+  StationIndex: Integer;
 begin
   Stations.Add(Station);
   Station.Lines.Add(Self);
+  StationIndex := Stations.Count - 1;
   if Stations.Count = 1 then begin
     SetLength(TrackPoints, Length(TrackPoints) + 1);
-    TrackPoints[High(TrackPoints)] := Station.Position;
+    TrackPoints[High(TrackPoints)].StationIndex := StationIndex;
+    TrackPoints[High(TrackPoints)].Point := Station.Position;
   end else begin
      if Stations.Count > 1 then
-       AddTrack(TMetroStation(Stations[Stations.Count - 2]).Position, Station.Position);
+       AddTrack(TMetroStation(Stations[Stations.Count - 2]).Position, Station.Position, StationIndex);
        // Place one train if at least two stations present
        if (Stations.Count = 2) then begin
@@ -278 +296 @@
          if Assigned(Train) then begin
            Train.Line := Self;
-           Train.TargetStation := TMetroStation(Stations.First);
+           Train.TargetStationIndex := 0;
            Trains.Add(Train);
          end;
@@ -289 +307 @@
 var
   I: Integer;
+  StationIndex: Integer;
 begin
   if (Stations.Count > 0) and (Stations.Last = Station) then begin
-    Stations.Delete(Stations.Count - 1);
+    StationIndex := Stations.Count - 1;
+    Stations.Delete(StationIndex);
     Station.Lines.Remove(Self);
     if Stations.Count > 0 then begin
-      while (Length(TrackPoints) > 0) and (not ComparePoint(TrackPoints[High(TrackPoints)], TMetroStation(Stations.Last).Position)) do
+      while (Length(TrackPoints) > 0) and (not ComparePoint(TrackPoints[High(TrackPoints)].Point,
+        TMetroStation(Stations.Last).Position)) do
         SetLength(TrackPoints, Length(TrackPoints) - 1);
     end else SetLength(TrackPoints, 0);
@@ -307 +328 @@
 end;
 
-procedure TMetroLine.AddTrack(P1, P2: TPoint);
+procedure TMetroLine.AddTrack(P1, P2: TPoint; StationIndex: Integer);
 var
   Delta: TPoint;
@@ -314 +335 @@
   if Abs(Delta.X) > Abs(Delta.Y) then begin
     SetLength(TrackPoints, Length(TrackPoints) + 1);
-    TrackPoints[High(TrackPoints)] := Point(P2.X - Sign(Delta.X) * Abs(Delta.Y), P1.Y);
+    TrackPoints[High(TrackPoints)].Point := Point(P2.X - Sign(Delta.X) * Abs(Delta.Y), P1.Y);
+    TrackPoints[High(TrackPoints)].StationIndex := StationIndex - 1;
   end else begin
     SetLength(TrackPoints, Length(TrackPoints) + 1);
-    TrackPoints[High(TrackPoints)] := Point(P1.X, P2.Y - Sign(Delta.Y) * Abs(Delta.X));
+    TrackPoints[High(TrackPoints)].Point := Point(P1.X, P2.Y - Sign(Delta.Y) * Abs(Delta.X));
+    TrackPoints[High(TrackPoints)].StationIndex := StationIndex - 1;
   end;
   SetLength(TrackPoints, Length(TrackPoints) + 1);
-  TrackPoints[High(TrackPoints)] := P2;
+  TrackPoints[High(TrackPoints)].Point := P2;
+  TrackPoints[High(TrackPoints)].StationIndex := StationIndex;
 end;
 
@@ -330 +354 @@
   for I := 0 to High(TrackPoints) do
   if I > 0 then
-    Result := Result + Distance(TrackPoints[I], TrackPoints[I - 1]);
-end;
-
-function TMetroLine.GetStationTrackPos(Station: TMetroStation): Integer;
+    Result := Result + Distance(TrackPoints[I].Point, TrackPoints[I - 1].Point);
+end;
+
+function TMetroLine.GetStationTrackPos(StationIndex: Integer): Integer;
 var
   I: Integer;
@@ -340 +364 @@
   for I := 0 to High(TrackPoints) do begin
     if I > 0 then
-      Result := Result + Distance(TrackPoints[I], TrackPoints[I - 1]);
-    if (TrackPoints[I].X = Station.Position.X) and (TrackPoints[I].Y = Station.Position.Y) then Break;
+      Result := Result + Distance(TrackPoints[I].Point, TrackPoints[I - 1].Point);
+    if TrackPoints[I].StationIndex = StationIndex then Break;
   end;
 end;
@@ -362 +386 @@
 { TMetroTrain }
 
-function TMetroTrain.GetPos: TPoint;
+function TMetroTrain.GetTargetStation: TMetroStation;
+begin
+  Result := nil;
+  if Assigned(Line) then
+  if (TargetStationIndex >= 0) and (TargetStationIndex < Line.Stations.Count) then
+    Result := TMetroStation(Line.Stations[TargetStationIndex]);
+end;
+
+function TMetroTrain.GetPosition: TPoint;
 var
   I: Integer;
@@ -374 +406 @@
     if Length(TrackPoints) > 1 then
     for I := 1 to High(TrackPoints) do begin
-      D := Distance(TrackPoints[I], TrackPoints[I - 1]);
+      D := Distance(TrackPoints[I].Point, TrackPoints[I - 1].Point);
       if (Sum + D) > Self.TrackPos then begin
-        R := Point(TrackPoints[I].X - TrackPoints[I - 1].X, TrackPoints[I].Y - TrackPoints[I - 1].Y);
-        Result := Point(Trunc(TrackPoints[I - 1].X + R.X * (TrackPos - Sum) / D),
-          Trunc(TrackPoints[I - 1].Y + R.Y * (TrackPos - Sum) / D));
+        R := Point(TrackPoints[I].Point.X - TrackPoints[I - 1].Point.X,
+          TrackPoints[I].Point.Y - TrackPoints[I - 1].Point.Y);
+        Result := Point(Trunc(TrackPoints[I - 1].Point.X + R.X * (TrackPos - Sum) / D),
+          Trunc(TrackPoints[I - 1].Point.Y + R.Y * (TrackPos - Sum) / D));
         Exit;
       end else Sum := Sum + D;
     end;
-    Result := TrackPoints[High(TrackPoints)];
+    Result := TrackPoints[High(TrackPoints)].Point;
   end else Result := Point(0, 0);
 end;
@@ -482 +515 @@
   with TMetroLine(Lines[I]) do begin
     for T := 1 to High(TrackPoints) do begin
-      D := PointToLineDistance(Pos, TrackPoints[T - 1], TrackPoints[T]);
+      D := PointToLineDistance(Pos, TrackPoints[T - 1].Point, TrackPoints[T].Point);
       if D < Distance then begin
         Result := TMetroLine(Lines[I]);
@@ -616 +649 @@
   P: Integer;
   PosDelta: Integer;
-  TargetStationIndex: Integer;
   CurrentStation: TMetroStation;
-  BestStation: TMetroStation;
 begin
   if State = gsRunning then begin
+
+  // Add new stations
+  if (Now - LastNewWeekTime) > 7 then begin
+    LastNewWeekTime := Now;
+    Trains.AddNew;
+    // TODO: Show notification screen with confirmation
+  end;
 
   // Add new stations
@@ -653 +691 @@
 
           // Choose next target station
-          TargetStationIndex := Line.Stations.IndexOf(TargetStation) + Direction;
+          TargetStationIndex := TargetStationIndex + Direction;
           if TargetStationIndex < 0 then begin
-            TargetStationIndex := 1;
-            Direction := -Direction;
+            if Line.Stations.Last = Line.Stations.First then begin
+              TargetStationIndex := Line.Stations.Count - 2;
+              TrackPos := Line.GetStationTrackPos(Line.Stations.Count - 1);
+            end else begin
+              TargetStationIndex := 1;
+              Direction := -Direction;
+            end;
           end else if TargetStationIndex >= Line.Stations.Count then begin
-            TargetStationIndex := Line.Stations.Count - 2;
-            Direction := -Direction;
+            if Line.Stations.Last = Line.Stations.First then begin
+              TargetStationIndex := 1;
+              TrackPos := 0;
+            end else begin
+              TargetStationIndex := Line.Stations.Count - 2;
+              Direction := -Direction;
+            end;
           end;
-          TargetStation := TMetroStation(Line.Stations[TargetStationIndex]);
 
           // Unload passengers in target station
@@ -695 +742 @@
           end;
 
-          LastPosDelta := Abs(TrackPos - Line.GetStationTrackPos(TargetStation));
+          LastPosDelta := Abs(TrackPos - Line.GetStationTrackPos(TargetStationIndex));
           InStation := False;
         end;
@@ -701 +748 @@
       TrackPos := TrackPos + Direction * TrainSpeed;
       if TrackPos < 0 then begin
-        TrackPos := 0;
+        if Line.Stations.First = Line.Stations.Last then TrackPos := Line.GetTrackLength
+          else TrackPos := 0;
       end else
       if TrackPos > Line.GetTrackLength then begin
-        TrackPos := Line.GetTrackLength;
-      end;
-      PosDelta := Abs(TrackPos - Line.GetStationTrackPos(TargetStation));
+        if Line.Stations.First = Line.Stations.Last then TrackPos := 0
+          else TrackPos := Line.GetTrackLength;
+      end;
+      PosDelta := Abs(TrackPos - Line.GetStationTrackPos(TargetStationIndex));
       if PosDelta >= LastPosDelta then begin
         // We are getting far from station, stop at station
-        TrackPos := Line.GetStationTrackPos(TargetStation);
+        TrackPos := Line.GetStationTrackPos(TargetStationIndex);
         InStation := True;
         StationStopTime := Now;
@@ -721 +770 @@
   for I := 0 to Stations.Count - 1 do
   with TMetroStation(Stations[I]) do begin
-    //if Passengers.Count > MaxWaitingPassengers then State := gsGameOver;
+    if Passengers.Count > MaxWaitingPassengers then State := gsGameOver;
   end;
 
@@ -837 +886 @@
   LastNewStationTime := Now;
   LastNewPassengerTime := Now;
+  LastNewWeekTime := Now;
   State := gsRunning;
   StartTime := Now;
@@ -899 +949 @@
     Canvas.Pen.Style := psSolid;
     Canvas.Pen.Width := 15;
-    if Length(TrackPoints) > 0 then Canvas.MoveTo(TrackPoints[0]);
+    if Length(TrackPoints) > 0 then Canvas.MoveTo(TrackPoints[0].Point);
     for S := 1 to High(TrackPoints) do begin
-      Canvas.LineTo(TrackPoints[S]);
+      Canvas.LineTo(TrackPoints[S].Point);
       if (S = High(TrackPoints)) then begin
-        Angle := arctan2((TrackPoints[S].Y - TrackPoints[S - 1].Y), (TrackPoints[S].X - TrackPoints[S - 1].X));
-        EndPoint := Point(Round(TrackPoints[S].X + EndStationLength * Cos(Angle)),
-          Round(TrackPoints[S].Y + EndStationLength * Sin(Angle)));
+        Angle := arctan2((TrackPoints[S].Point.Y - TrackPoints[S - 1].Point.Y), (TrackPoints[S].Point.X - TrackPoints[S - 1].Point.X));
+        EndPoint := Point(Round(TrackPoints[S].Point.X + EndStationLength * Cos(Angle)),
+          Round(TrackPoints[S].Point.Y + EndStationLength * Sin(Angle)));
         Canvas.LineTo(EndPoint);
         Canvas.MoveTo(Point(Round(EndPoint.X + Cos(Angle + Pi / 2) * EndStationLength / 3),
@@ -914 +964 @@
     end;
     if (Length(TrackPoints) > 1) then begin
-      Angle := arctan2((TrackPoints[1].Y - TrackPoints[0].Y), (TrackPoints[1].X - TrackPoints[0].X));
-      Canvas.MoveTo(TrackPoints[0]);
-      EndPoint := Point(Round(TrackPoints[0].X - EndStationLength * Cos(Angle)),
-        Round(TrackPoints[0].Y - EndStationLength * Sin(Angle)));
+      Angle := arctan2((TrackPoints[1].Point.Y - TrackPoints[0].Point.Y), (TrackPoints[1].Point.X - TrackPoints[0].Point.X));
+      Canvas.MoveTo(TrackPoints[0].Point);
+      EndPoint := Point(Round(TrackPoints[0].Point.X - EndStationLength * Cos(Angle)),
+        Round(TrackPoints[0].Point.Y - EndStationLength * Sin(Angle)));
       Canvas.LineTo(EndPoint);
       Canvas.MoveTo(Point(Round(EndPoint.X - Cos(Angle + Pi / 2) * EndStationLength / 3),
@@ -939 +989 @@
       Canvas.Brush.Style := bsSolid;
       Canvas.Pen.Style := psClear;
-      Pos := GetPos;
+      Pos := GetPosition;
       Canvas.Rectangle(Pos.X - TrainSize div 2, Pos.Y - TrainSize div 2,
         Pos.X + TrainSize div 2, Pos.Y + TrainSize div 2);