Changeset 93 for trunk/UEngine.pas

Timestamp:

Sep 26, 2022, 10:39:03 PM (20 months ago)

Author:

chronos

Message:

• Added: Support for train carriages.
• Added: City support implementation preparation.

File:

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

trunk/UEngine.pas

@@ -7 +7 @@
 uses
   {$IFDEF DARWIN}MacOSAll, CocoaAll, CocoaUtils,{$ENDIF}
-  Classes, SysUtils, Graphics, Controls, ExtCtrls, Math, DateUtils,
+  Classes, SysUtils, Graphics, Controls, ExtCtrls, Math, DateUtils, URegistry,
   UMetaCanvas, Generics.Collections, Generics.Defaults, UMenu, UControls,
-  UMetroPassenger, UColors, UView, URiver, UTrack;
+  UMetroPassenger, UColors, UView, URiver, UTrack, UCity, UGeometric;
 
 type
-  TStationShapeSet = set of TStationShape;
   TEngine = class;
   TMetroLines = class;
@@ -18 +17 @@
   TMetroTrains = class;
   TLineStation = class;
+  TMetroTrain = class;
 
   { TMapStation }
@@ -89 +89 @@
   end;
 
-  TMetroTrain = class;
-
   { TMetroCarriage }
 
   TMetroCarriage = class
     Train: TMetroTrain;
+    Passengers: TMetroPassengers;
+    function GetTrackPosition: TTrackPosition;
+    function GetVector: TVector;
+    constructor Create;
+    destructor Destroy; override;
   end;
 
@@ -100 +103 @@
 
   TMetroCarriages = class(TObjectList<TMetroCarriage>)
+    function GetUnused: TMetroCarriage;
+    function GetUnusedCount: Integer;
+    function AddNew: TMetroCarriage;
   end;
 
@@ -113 +119 @@
   public
     Passengers: TMetroPassengers;
-    BaseTrackPoint: TTrackPoint;
-    RelPos: Double;
+    TrackPosition: TTrackPosition;
     Direction: Integer;
     InStation: Boolean;
@@ -122 +127 @@
     function GetPosition: TPoint;
     function GetAngle: Double;
+    function GetVector: TVector;
     constructor Create;
     destructor Destroy; override;
@@ -130 +136 @@
 
   TMetroTrains = class(TObjectList<TMetroTrain>)
-    function GetUnusedTrain: TMetroTrain;
+    function GetUnused: TMetroTrain;
     function GetUnusedCount: Integer;
     function AddNew: TMetroTrain;
@@ -174 +180 @@
     function GetTrackOnPos(Pos: TPoint): TTrackLink;
     function GetTrainOnPos(Pos: TPoint): TMetroTrain;
+    function GetCarriageOnPos(Pos: TPoint): TMetroCarriage;
     procedure DrawLine(Canvas: TCanvas; Pos: TPoint);
     procedure DrawShape(Canvas: TCanvas; Position: TPoint; Shape: TStationShape;
@@ -207 +214 @@
     procedure FullScreenChanged(Sender: TObject);
     procedure UpdateInterface;
+    procedure InitCities;
   public
     Colors: TColors;
@@ -213 +221 @@
     Lines: TMetroLines;
     Trains: TMetroTrains;
+    Carriages: TMetroCarriages;
     ShapeCount: Integer;
     Map: TMap;
     View: TView;
+    Cities: TCities;
     SelectedLine: TMetroLine;
     SelectedTrain: TMetroTrain;
+    SelectedCarriage: TMetroCarriage;
     TrackStationDown: TTrackPoint;
     TrackStationUp: TTrackPoint;
@@ -228 +239 @@
     ImagePause: TImage;
     ImageFastForward: TImage;
+    ImageCarriage: TImage;
     HighestServedPassengerCount: Integer;
     HighestServedDaysCount: Integer;
@@ -239 +251 @@
     procedure NewGame;
     procedure Redraw;
+    procedure LoadFromRegistry(Context: TRegistryContext);
+    procedure SaveToRegistry(Context: TRegistryContext);
     constructor Create;
     destructor Destroy; override;
@@ -262 +276 @@
   PassengerSize = 15;
   TrainSize = 40;
+  TrainGap = 5;
   LineColorsDist = 50;
   TrainSpeed = 2000;
@@ -292 +307 @@
 
 uses
-  UGeometric, UFormMain, ULanguages;
+  UFormMain, ULanguages;
 
 resourcestring
@@ -305 +320 @@
   SStationWithoutMapStation = 'Station have to have MapStation';
 
+  // Cities
+  SPrague = 'Prague';
+  SLondon = 'London';
+  SParis = 'Paris';
+  SNewYork = 'New York';
+  STokyo = 'Tokyo';
+
+{ TMetroCarriage }
+
+function TMetroCarriage.GetTrackPosition: TTrackPosition;
+begin
+  if Assigned(Train) then begin
+    Result := Train.TrackPosition;
+    Result.Move(-Train.Direction * (TrainSize + TrainGap) * (Train.Carriages.IndexOf(Self) + 1));
+  end;
+end;
+
+function TMetroCarriage.GetVector: TVector;
+begin
+  Result := Train.GetVector;
+  Result.Position := AddPoint(Result.Position, Point(TrainSize, TrainSize));
+end;
+
+constructor TMetroCarriage.Create;
+begin
+  Passengers := TMetroPassengers.Create;
+  Passengers.OwnsObjects := False;
+end;
+
+destructor TMetroCarriage.Destroy;
+begin
+  FreeAndNil(Passengers);
+  inherited;
+end;
+
+{ TMetroCarriages }
+
+function TMetroCarriages.GetUnused: TMetroCarriage;
+var
+  I: Integer;
+begin
+  I := 0;
+  while (I < Count) and (Assigned(Items[I].Train)) do Inc(I);
+  if I < Count then Result := Items[I]
+    else Result := nil;
+end;
+
+function TMetroCarriages.GetUnusedCount: Integer;
+var
+  I: Integer;
+begin
+  Result := 0;
+  for I := 0 to Count - 1 do
+    if not Assigned(Items[I].Train) then Inc(Result);
+end;
+
+function TMetroCarriages.AddNew: TMetroCarriage;
+begin
+  Result := TMetroCarriage.Create;
+  Add(Result);
+end;
+
 { TMap }
 
@@ -332 +409 @@
 { TMetroTrains }
 
-function TMetroTrains.GetUnusedTrain: TMetroTrain;
+function TMetroTrains.GetUnused: TMetroTrain;
 var
   I: Integer;
@@ -519 +596 @@
   // Place one train if at least two stations present
   if (LineStations.Count = 2) then begin
-    Train := Engine.Trains.GetUnusedTrain;
+    Train := Engine.Trains.GetUnused;
     if Assigned(Train) then begin
       Train.Line := Self;
       Train.TargetStation := LineStations[0];
-      Train.BaseTrackPoint := Track.Points.First;
+      Train.TrackPosition.BaseTrackPoint := Track.Points.First;
       Trains.Add(Train);
     end;
@@ -551 +628 @@
     IsOnTrack := False;
     for J := Track.Points.IndexOf(TP1) to Track.Points.IndexOf(TP2) do
-    if Track.Points[J] = BaseTrackPoint then begin
+    if Track.Points[J] = TrackPosition.BaseTrackPoint then begin
       IsOnTrack := True;
       Break;
     end;
     if IsOnTrack then begin
-      if Assigned(BaseTrackPoint) and Assigned(BaseTrackPoint.GetUp) and (BaseTrackPoint.GetUp <> ALineStation.TrackPoint) then
-        BaseTrackPoint := BaseTrackPoint.GetUp
+      if Assigned(TrackPosition.BaseTrackPoint) and Assigned(TrackPosition.BaseTrackPoint.GetUp) and
+        (TrackPosition.BaseTrackPoint.GetUp <> ALineStation.TrackPoint) then
+        TrackPosition.BaseTrackPoint := TrackPosition.BaseTrackPoint.GetUp
       else
-      if Assigned(BaseTrackPoint) and Assigned(BaseTrackPoint.GetDown) and (BaseTrackPoint.GetDown <> ALineStation.TrackPoint) then
-        BaseTrackPoint := BaseTrackPoint.GetDown
-      else BaseTrackPoint := nil;
+      if Assigned(TrackPosition.BaseTrackPoint) and Assigned(TrackPosition.BaseTrackPoint.GetDown) and
+        (TrackPosition.BaseTrackPoint.GetDown <> ALineStation.TrackPoint) then
+        TrackPosition.BaseTrackPoint := TrackPosition.BaseTrackPoint.GetDown
+      else TrackPosition.BaseTrackPoint := nil;
     end;
   end;
@@ -633 +712 @@
   FLine := AValue;
   if AValue = nil then begin
-    RelPos := 0;
-    BaseTrackPoint := nil;
+    TrackPosition.RelPos := 0;
+    TrackPosition.BaseTrackPoint := nil;
     TargetStation := nil;
   end;
@@ -646 +725 @@
 begin
   Result := 0;
-  if Assigned(BaseTrackPoint) and Assigned(TargetStation) then begin
-  Current := Line.Track.Points.IndexOf(BaseTrackPoint);
+  if Assigned(TrackPosition.BaseTrackPoint) and Assigned(TargetStation) then begin
+  Current := Line.Track.Points.IndexOf(TrackPosition.BaseTrackPoint);
   Target := Line.Track.Points.IndexOf(TargetStation.TrackPoint);
   if Current < Target then begin
     for I := Current to Target - 1 do
       Result := Result + Line.Track.Points[I].GetDistance;
-    Result := Result - Trunc(RelPos);
+    Result := Result - Trunc(TrackPosition.RelPos);
   end else
   if Current > Target then begin
     for I := Current - 1 downto Target do
       Result := Result + Line.Track.Points[I].GetDistance;
-    Result := Result + Trunc(RelPos);
-  end else Result := Trunc(RelPos);
+    Result := Result + Trunc(TrackPosition.RelPos);
+  end else Result := Trunc(TrackPosition.RelPos);
   end;
 end;
@@ -669 +748 @@
 begin
   Result := Point(0, 0);
-  if Assigned(BaseTrackPoint) then
-  with BaseTrackPoint do begin
-    UpPoint := BaseTrackPoint.GetNeighUp;
+  if Assigned(TrackPosition.BaseTrackPoint) then
+  with TrackPosition.BaseTrackPoint do begin
+    UpPoint := TrackPosition.BaseTrackPoint.GetNeighUp;
     if Assigned(UpPoint) then begin
       D := Distance(UpPoint.Position, Position);
       if D > 0 then begin
         Delta := SubPoint(UpPoint.Position, Position);
-        Result := Point(Trunc(Position.X + Delta.X * RelPos / D),
-          Trunc(Position.Y + Delta.Y * RelPos / D));
+        Result := Point(Trunc(Position.X + Delta.X * TrackPosition.RelPos / D),
+          Trunc(Position.Y + Delta.Y * TrackPosition.RelPos / D));
       end;
     end;
@@ -688 +767 @@
 begin
   Result := 0;
-  if Assigned(BaseTrackPoint) then
-  with BaseTrackPoint do begin
-    UpPoint := BaseTrackPoint.GetNeighUp;
+  if Assigned(TrackPosition.BaseTrackPoint) then
+  with TrackPosition.BaseTrackPoint do begin
+    UpPoint := TrackPosition.BaseTrackPoint.GetNeighUp;
     if Assigned(UpPoint) then begin
       Result := ArcTan2(UpPoint.Position.Y - Position.Y,
@@ -698 +777 @@
 end;
 
+function TMetroTrain.GetVector: TVector;
+var
+  D: Integer;
+  UpPoint: TTrackPoint;
+begin
+  Result.Position := Point(0, 0);
+  if Assigned(TrackPosition.BaseTrackPoint) then
+  with TrackPosition.BaseTrackPoint do begin
+    UpPoint := TrackPosition.BaseTrackPoint.GetNeighUp;
+    if Assigned(UpPoint) then begin
+      D := Distance(UpPoint.Position, Position);
+      if D > 0 then begin
+        Result.Direction := SubPoint(UpPoint.Position, Position);
+        Result.Position := Point(Trunc(Position.X + Result.Direction.X * TrackPosition.RelPos / D),
+          Trunc(Position.Y + Result.Direction.Y * TrackPosition.RelPos / D));
+      end;
+    end;
+  end;
+end;
+
 constructor TMetroTrain.Create;
 begin
@@ -703 +802 @@
   Passengers.OwnsObjects := False;
   Carriages := TMetroCarriages.Create;
+  Carriages.OwnsObjects := False;
   Direction := 1;
   Line := nil;
@@ -976 +1076 @@
       Result := Trains[I];
       MinDistance := D;
+    end;
+  end;
+end;
+
+function TEngine.GetCarriageOnPos(Pos: TPoint): TMetroCarriage;
+var
+  I: Integer;
+  J: Integer;
+  MinDistance: Integer;
+  D: Integer;
+begin
+  Result := nil;
+  MinDistance := High(Integer);
+  for I := 0 to Trains.Count - 1 do
+  with TMetroTrain(Trains[I]) do begin
+    for J := 0 to Carriages.Count - 1 do
+    with TMetroCarriage(Carriages[J]) do begin
+      D := Distance(GetTrackPosition.GetVector.Position, Pos);
+      if (D < (TrainSize div 2)) and (D < MinDistance) then begin
+        Result := Carriages[J];
+        MinDistance := D;
+      end;
     end;
   end;
@@ -1216 +1338 @@
 var
   I: Integer;
+  J: Integer;
   CurrentStation: TLineStation;
   P: Integer;
@@ -1223 +1346 @@
   PosChange: Double;
   TP: TTrackPoint;
+  Done: Boolean;
 begin
   // Move trains
   for I := 0 to Trains.Count - 1 do
   with TMetroTrain(Trains[I]) do begin
-    if not Assigned(TargetStation) and Assigned(BaseTrackPoint) then begin
+    if not Assigned(TargetStation) and Assigned(TrackPosition.BaseTrackPoint) then begin
       if (Direction <> 1) and (Direction <> -1) then Direction := 1
         else Direction := -Direction;
-      TP := BaseTrackPoint.GetUp;
+      TP := TrackPosition.BaseTrackPoint.GetUp;
       if Assigned(TP) then TargetStation := TLineStation(TP.OwnerPoint)
       else begin
-        TP := BaseTrackPoint.GetDown;
+        TP := TrackPosition.BaseTrackPoint.GetDown;
         if Assigned(TP) then TargetStation := TLineStation(TP.OwnerPoint);
       end;
@@ -1247 +1371 @@
             if Line.IsCircular then begin
               TargetStationIndex := Line.LineStations.Count - 2;
-              BaseTrackPoint := Line.LineStations.Last.TrackPoint;
-              RelPos := 0;
+              TrackPosition.BaseTrackPoint := Line.LineStations.Last.TrackPoint;
+              TrackPosition.RelPos := 0;
             end else begin
               TargetStationIndex := 1;
@@ -1257 +1381 @@
             if Line.IsCircular then begin
               TargetStationIndex := 1;
-              BaseTrackPoint := Line.LineStations.First.TrackPoint;
-              RelPos := 0;
+              TrackPosition.BaseTrackPoint := Line.LineStations.First.TrackPoint;
+              TrackPosition.RelPos := 0;
             end else begin
               TargetStationIndex := Line.LineStations.Count - 2;
@@ -1267 +1391 @@
 
           // Unload passengers in target station
-          if Assigned(CurrentStation) then
-          for P := Passengers.Count - 1 downto 0 do begin
-            if Passengers[P].Shape = CurrentStation.MapStation.Shape then begin
-              Passenger := Passengers[P];
-              Passengers.Delete(P);
-              Self.Passengers.Remove(Passenger);
-              Inc(ServedPassengerCount);
+          if Assigned(CurrentStation) then begin
+            for P := Passengers.Count - 1 downto 0 do begin
+              if Passengers[P].Shape = CurrentStation.MapStation.Shape then begin
+                Passenger := Passengers[P];
+                Passengers.Delete(P);
+                Self.Passengers.Remove(Passenger);
+                Inc(ServedPassengerCount);
+              end;
+            end;
+            for J := 0 to Carriages.Count - 1 do
+            with Carriages[J] do begin
+              for P := Passengers.Count - 1 downto 0 do begin
+                if Passengers[P].Shape = CurrentStation.MapStation.Shape then begin
+                  Passenger := Passengers[P];
+                  Passengers.Delete(P);
+                  Self.Passengers.Remove(Passenger);
+                  Inc(ServedPassengerCount);
+                end;
+              end;
             end;
           end;
+
           // Unload passengers to change line
-          if Assigned(CurrentStation)  then
-          for P := Passengers.Count - 1 downto 0 do begin
-            if not CurrentStation.MapStation.IsBestStationForShape(Passengers[P].Shape,
-            TargetStation, CurrentStation) then begin
-              Passenger := Passengers[P];
-              Passengers.Delete(P);
-              CurrentStation.MapStation.Passengers.Add(Passenger);
+          if Assigned(CurrentStation) then begin
+            for P := Passengers.Count - 1 downto 0 do begin
+              if not CurrentStation.MapStation.IsBestStationForShape(Passengers[P].Shape,
+              TargetStation, CurrentStation) then begin
+                Passenger := Passengers[P];
+                Passengers.Delete(P);
+                CurrentStation.MapStation.Passengers.Add(Passenger);
+              end;
+            end;
+            for J := 0 to Carriages.Count - 1 do
+            with Carriages[J] do begin
+              for P := Passengers.Count - 1 downto 0 do begin
+                if not CurrentStation.MapStation.IsBestStationForShape(Passengers[P].Shape,
+                TargetStation, CurrentStation) then begin
+                  Passenger := Passengers[P];
+                  Passengers.Delete(P);
+                  CurrentStation.MapStation.Passengers.Add(Passenger);
+                end;
+              end;
             end;
           end;
@@ -1299 +1448 @@
                 Passengers.Add(Passenger);
               end;
-            end else Break; // No more space
+            end else begin
+              Done := False;
+              for J := 0 to Carriages.Count - 1 do
+              with Carriages[J] do begin
+                if (Passengers.Count < TrainPassengerCount) then begin
+                  Passenger := CurrentStation.MapStation.Passengers[P];
+                  if CurrentStation.MapStation.IsBestStationForShape(Passenger.Shape,
+                  TargetStation, CurrentStation) then begin
+                    CurrentStation.MapStation.Passengers.Delete(P);
+                    Passengers.Add(Passenger);
+                    Done := True;
+                    Break;
+                  end;
+                end;
+              end;
+              if not Done then Break;
+            end;
           end;
 
@@ -1308 +1473 @@
       end else begin
         PosChange := Direction + Trunc(Direction * TrainSpeed * (Time - LastTrainMoveTime));
-        RelPos := RelPos + PosChange;
+        TrackPosition.RelPos := TrackPosition.RelPos + PosChange;
         LastTrainMoveTime := Time;
         Redraw;
-        if Assigned(BaseTrackPoint) then
-        while (Direction = -1) and (RelPos < 0) do begin
-          if BaseTrackPoint <> Line.LineStations.First.TrackPoint then begin
-            BaseTrackPoint := BaseTrackPoint.GetNeighDown;
-            if Assigned(BaseTrackPoint) then
-              RelPos := RelPos + BaseTrackPoint.GetDistance
+        if Assigned(TrackPosition.BaseTrackPoint) then
+        while (Direction = -1) and (TrackPosition.RelPos < 0) do begin
+          if TrackPosition.BaseTrackPoint <> Line.LineStations.First.TrackPoint then begin
+            TrackPosition.BaseTrackPoint := TrackPosition.BaseTrackPoint.GetNeighDown;
+            if Assigned(TrackPosition.BaseTrackPoint) then
+              TrackPosition.RelPos := TrackPosition.RelPos + TrackPosition.BaseTrackPoint.GetDistance
             else begin
-              BaseTrackPoint := Line.LineStations.First.TrackPoint;
-              RelPos := 0;
+              TrackPosition.BaseTrackPoint := Line.LineStations.First.TrackPoint;
+              TrackPosition.RelPos := 0;
             end;
           end else
           if Line.IsCircular then begin
-            BaseTrackPoint := Line.LineStations.Last.TrackPoint;
-            RelPos := RelPos + BaseTrackPoint.GetDistance;
+            TrackPosition.BaseTrackPoint := Line.LineStations.Last.TrackPoint;
+            TrackPosition.RelPos := TrackPosition.RelPos + TrackPosition.BaseTrackPoint.GetDistance;
           end else begin
-            RelPos := 0;
+            TrackPosition.RelPos := 0;
             Break;
           end;
         end;
-        if Assigned(BaseTrackPoint) then
-        while (Direction = 1) and (RelPos > BaseTrackPoint.GetDistance) do begin
-          if BaseTrackPoint <> Line.LineStations.Last.TrackPoint then begin
-            RelPos := RelPos - BaseTrackPoint.GetDistance;
-            BaseTrackPoint := BaseTrackPoint.GetNeighUp;
-            if not Assigned(BaseTrackPoint) then begin
-              BaseTrackPoint := Line.LineStations.Last.TrackPoint;
-              RelPos := 0;
+        if Assigned(TrackPosition.BaseTrackPoint) then
+        while (Direction = 1) and (TrackPosition.RelPos > TrackPosition.BaseTrackPoint.GetDistance) do begin
+          if TrackPosition.BaseTrackPoint <> Line.LineStations.Last.TrackPoint then begin
+            TrackPosition.RelPos := TrackPosition.RelPos - TrackPosition.BaseTrackPoint.GetDistance;
+            TrackPosition.BaseTrackPoint := TrackPosition.BaseTrackPoint.GetNeighUp;
+            if not Assigned(TrackPosition.BaseTrackPoint) then begin
+              TrackPosition.BaseTrackPoint := Line.LineStations.Last.TrackPoint;
+              TrackPosition.RelPos := 0;
             end;
           end else
           if Line.IsCircular then begin
-            RelPos := RelPos - BaseTrackPoint.GetDistance;
-            BaseTrackPoint := Line.LineStations.First.TrackPoint;
+            TrackPosition.RelPos := TrackPosition.RelPos - TrackPosition.BaseTrackPoint.GetDistance;
+            TrackPosition.BaseTrackPoint := Line.LineStations.First.TrackPoint;
           end else begin
-            RelPos := BaseTrackPoint.GetDistance;
+            TrackPosition.RelPos := TrackPosition.BaseTrackPoint.GetDistance;
             Break;
           end;
@@ -1351 +1516 @@
         if PosDelta >= LastPosDelta then begin
           // We are getting far from station, stop at station
-          BaseTrackPoint := TargetStation.TrackPoint;
-          RelPos := 0;
+          TrackPosition.BaseTrackPoint := TargetStation.TrackPoint;
+          TrackPosition.RelPos := 0;
           InStation := True;
           StationStopTime := Time;
@@ -1549 +1714 @@
 end;
 
+procedure TEngine.InitCities;
+begin
+  with Cities do begin
+    AddNew(SLondon);
+    AddNew(SNewYork);
+    AddNew(SPrague);
+    AddNew(SParis);
+    AddNew(STokyo);
+  end;
+end;
+
 procedure TEngine.InitMenus;
 begin
@@ -1704 +1880 @@
 procedure TEngine.DrawTrains(Canvas: TCanvas);
 var
+  I: Integer;
   P: Integer;
   Pos: TPoint;
@@ -1711 +1888 @@
   Train: TMetroTrain;
   Passenger: TMetroPassenger;
+  Carriage: TMetroCarriage;
+  Vector: TVector;
 begin
   for Train in Trains do
@@ -1718 +1897 @@
       Canvas.Brush.Style := bsSolid;
       Canvas.Pen.Style := psClear;
-      Pos := GetPosition;
-      Angle := GetAngle;
+      Vector := GetVector;
+      Pos := Vector.Position;
+      Angle := Vector.GetAngle;
 
       SetLength(Points, 4);
@@ -1736 +1916 @@
         DrawShape(Canvas, ShapePos, Shape, TrainSize div 3, Angle + Pi / 2);
         Inc(P);
+      end;
+
+      // Draw carriages
+      for Carriage in Train.Carriages do
+      with Carriage do begin
+        Canvas.Brush.Color := Line.Color;
+        Canvas.Brush.Style := bsSolid;
+        Canvas.Pen.Style := psClear;
+        Vector := GetTrackPosition.GetVector;
+        Pos := Vector.Position;
+        Angle := Vector.GetAngle;
+
+        SetLength(Points, 4);
+        Points[0] := RotatePoint(Pos, Point(Pos.X - TrainSize div 2, Pos.Y - TrainSize div 3), Angle);
+        Points[1] := RotatePoint(Pos, Point(Pos.X + TrainSize div 2, Pos.Y - TrainSize div 3), Angle);
+        Points[2] := RotatePoint(Pos, Point(Pos.X + TrainSize div 2, Pos.Y + TrainSize div 3), Angle);
+        Points[3] := RotatePoint(Pos, Point(Pos.X - TrainSize div 2, Pos.Y + TrainSize div 3), Angle);
+        Canvas.Polygon(Points);
+        Canvas.Brush.Color := clWhite;
+        P := 0;
+        for Passenger in Passengers do
+        with Passenger do begin
+          ShapePos := Point(Pos.X - Trunc(TrainSize div 3 * 1) + (P mod 3) * TrainSize div 3,
+            Pos.Y - Trunc(TrainSize div 6 * 1) + (P div 3) * TrainSize div 3);
+          ShapePos := RotatePoint(Pos, ShapePos, Angle);
+          DrawShape(Canvas, ShapePos, Shape, TrainSize div 3, Angle + Pi / 2);
+          Inc(P);
+        end;
       end;
     end;
@@ -1977 +2185 @@
     CanvasSize.Y - LineColorsDist - Canvas.TextHeight(Text) div 2, Text);
 
+  // Draw unused carriages
+  Text := IntToStr(Carriages.GetUnusedCount);
+  Canvas.Draw(CanvasSize.X div 2 - Length(LineColors) div 2 * LineColorsDist - 200,
+    CanvasSize.Y - LineColorsDist - ImageCarriage.Bitmap.Height div 2, ImageCarriage.Bitmap);
+  Canvas.Brush.Style := bsClear;
+  Canvas.Font.Size := 14;
+  Canvas.Font.Color := Colors.Text;
+  Canvas.TextOut(CanvasSize.X div 2 - Length(LineColors) div 2 * LineColorsDist - 150 - Canvas.TextWidth(Text),
+    CanvasSize.Y - LineColorsDist - Canvas.TextHeight(Text) div 2, Text);
+
   // Status interface
   Text := IntToStr(ServedPassengerCount);
@@ -2011 +2229 @@
     ]);
   end;
+
+  // Show carriage grabbed by mouse
+  if Assigned(SelectedCarriage) then begin
+    Canvas.Brush.Color := Colors.Text; //SelectedTrain.Line.Color;
+    Canvas.Brush.Style := bsSolid;
+    Canvas.Pen.Style := psClear;
+    Pos := LastMousePos;
+    Angle := 0;
+
+    Canvas.Polygon([
+      RotatePoint(Pos, Point(Pos.X - TrainSize div 2, Pos.Y - TrainSize div 3), Angle),
+      RotatePoint(Pos, Point(Pos.X + TrainSize div 2, Pos.Y - TrainSize div 3), Angle),
+      RotatePoint(Pos, Point(Pos.X + TrainSize div 2, Pos.Y + TrainSize div 3), Angle),
+      RotatePoint(Pos, Point(Pos.X - TrainSize div 2, Pos.Y + TrainSize div 3), Angle)
+    ]);
+  end;
 end;
 
@@ -2026 +2260 @@
     LastNewWeekTime := Time;
     Trains.AddNew;
+    if Random < 0.2 then Carriages.AddNew;
     // TODO: Show notification screen with confirmation
     Redraw;
@@ -2160 +2395 @@
   I: Integer;
   FocusedTrack: TTrackLink;
+  FocusedTrain: TMetroTrain;
 begin
   if Button = mbLeft then begin
@@ -2193 +2429 @@
       if Assigned(SelectedTrain) then begin
         SelectedTrain.TargetStation := nil;
-        SelectedTrain.BaseTrackPoint := nil;
+        SelectedTrain.TrackPosition.BaseTrackPoint := nil;
         if Assigned(SelectedTrain.Line) then begin
           SelectedTrain.Line.Trains.Remove(SelectedTrain);
           SelectedTrain.Line := nil;
+
+          // Remove train carriages
+          for I := SelectedTrain.Carriages.Count - 1 downto 0 do begin
+            SelectedTrain.Carriages[I].Train := nil;
+            SelectedTrain.Carriages.Delete(I);
+          end;
         end;
         FocusedTrack := GetTrackOnPos(View.PointDestToSrc(Position));
@@ -2202 +2444 @@
           SelectedTrain.Line := TMetroLine(FocusedTrack.Points[0].Track.Owner);
           SelectedTrain.Line.Trains.Add(SelectedTrain);
-          SelectedTrain.BaseTrackPoint := FocusedTrack.Points[0];
+          SelectedTrain.TrackPosition.BaseTrackPoint := FocusedTrack.Points[0];
         end else
         if Assigned(FocusedTrack.Points[1]) then begin
           SelectedTrain.Line := TMetroLine(FocusedTrack.Points[1].Track.Owner);
           SelectedTrain.Line.Trains.Add(SelectedTrain);
-          SelectedTrain.BaseTrackPoint := FocusedTrack.Points[1];
+          SelectedTrain.TrackPosition.BaseTrackPoint := FocusedTrack.Points[1];
         end;
         FocusedTrack.Free;
+      end;
+
+      // Place selected carriage if focused train
+      if Assigned(SelectedCarriage) then begin
+        if Assigned(SelectedCarriage.Train) then begin
+          SelectedCarriage.Train.Carriages.Remove(SelectedCarriage);
+          SelectedCarriage.Train := nil;
+        end;
+        FocusedTrain := GetTrainOnPos(View.PointDestToSrc(Position));
+        if Assigned(FocusedTrain) then begin
+          SelectedCarriage.Train := FocusedTrain;
+          FocusedTrain.Carriages.Add(SelectedCarriage);
+        end;
       end;
 
@@ -2238 +2493 @@
   TrackStationUp := nil;
   SelectedTrain := nil;
+  SelectedCarriage := nil;
   Redraw;
 end;
@@ -2258 +2514 @@
     end;
 
+    // Carriage selection
+    SelectedCarriage := GetCarriageOnPos(View.PointDestToSrc(Position));
+    if Assigned(SelectedCarriage) then begin
+      Exit;
+    end;
+
     // Select unused train
     if (Distance(Position, Point(View.DestRect.Right div 2 - Length(LineColors) div 2 * LineColorsDist - 100,
       View.DestRect.Bottom - LineColorsDist)) < 30) and
     (Trains.GetUnusedCount > 0) then begin
-      SelectedTrain := Trains.GetUnusedTrain;
+      SelectedTrain := Trains.GetUnused;
+      Exit;
+    end;
+
+    // Select unused carriage
+    if (Distance(Position, Point(View.DestRect.Right div 2 - Length(LineColors) div 2 * LineColorsDist - 200,
+      View.DestRect.Bottom - LineColorsDist)) < 30) and
+    (Carriages.GetUnusedCount > 0) then begin
+      SelectedCarriage := Carriages.GetUnused;
       Exit;
     end;
@@ -2312 +2582 @@
   KeyEsc = 27;
   KeyF2 = 113;
+  KeyF3 = 114;
+  KeyF4 = 115;
 begin
   if Key = KeyEsc then begin
@@ -2325 +2597 @@
     if State = gsRunning then begin
       State := gsGameOver;
+      Redraw;
+    end;
+  end else
+  if Key = KeyF3 then begin
+    if State = gsRunning then begin
+      Trains.AddNew;
+      Redraw;
+    end;
+  end else
+  if Key = KeyF4 then begin
+    if State = gsRunning then begin
+      Carriages.AddNew;
       Redraw;
     end;
@@ -2388 +2672 @@
 begin
   RedrawPending := True;
+end;
+
+procedure TEngine.LoadFromRegistry(Context: TRegistryContext);
+begin
+  with TRegistryEx.Create do
+  try
+    CurrentContext := Context;
+    DarkMode := ReadBoolWithDefault('DarkMode', False);
+    HighestServedPassengerCount := ReadIntegerWithDefault('HighestPassengers', 0);
+    HighestServedDaysCount := ReadIntegerWithDefault('HighestDays', 0);
+  finally
+    Free;
+  end;
+end;
+
+procedure TEngine.SaveToRegistry(Context: TRegistryContext);
+begin
+  with TRegistryEx.Create do
+  try
+    CurrentContext := Context;
+
+    WriteBool('DarkMode', DarkMode);
+    WriteInteger('HighestPassengers', HighestServedPassengerCount);
+    WriteInteger('HighestDays', HighestServedDaysCount);
+  finally
+    Free;
+  end;
 end;
 
@@ -2409 +2720 @@
   View := TView.Create;
   Trains := TMetroTrains.Create;
+  Carriages := TMetroCarriages.Create;
   ImagePassenger := TImage.Create;
   ImageLocomotive := TImage.Create;
+  ImageCarriage := TImage.Create;
   ImagePlay := TImage.Create;
   ImagePlay.OnClick := ButtonPlay;
@@ -2422 +2735 @@
   //  ImageLocomotive.Picture.LoadFromFile(ImageLocomotiveName);
   MetaCanvas := TMetaCanvas.Create;
+  Cities := TCities.Create;
+  InitCities;
   Colors.Init(FDarkMode);
 end;
@@ -2427 +2742 @@
 destructor TEngine.Destroy;
 begin
+  FreeAndNil(Cities);
   FreeAndNil(MetaCanvas);
   FreeAndNil(Trains);
+  FreeAndNil(Carriages);
   FreeAndNil(ImagePlay);
   FreeAndNil(ImageFastForward);
   FreeAndNil(ImagePause);
+  FreeAndNil(ImageCarriage);
   FreeAndNil(ImageLocomotive);
   FreeAndNil(ImagePassenger);