Changeset 127 for trunk/UEngine.pas

Timestamp:

Apr 25, 2023, 10:52:20 PM (13 months ago)

Author:

chronos

Message:

• Added: Configurable station styles.
• Added: Configurable map visual styles.
• Added: Metro lines can be configured to be not movable.

File:

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

trunk/UEngine.pas

@@ -20 +20 @@
   TMetroTrain = class;
 
+  TStationStyle = (ssShapes, ssLinear, ssAlpha);
+
   { TMapStation }
 
@@ -28 +30 @@
   public
     Engine: TEngine;
-    Shape: TStationShape;
+    DestinationIndex: TDestinationIndex;
     Position: TPoint;
     Passengers: TMetroPassengers;
     Lines: TMetroLines;
-    ShapeDistance: array[TStationShape] of Integer;
+    DestinationDistance: array of Integer;
     OverloadDuration: TDateTime;
     IsTerminal: Boolean;
     function GetMaxPassengers: Integer;
-    function IsBestStationForShape(Shape: TStationShape; Check, Current: TLineStation): Boolean;
+    function IsBestStationForShape(DestinationIndex: TDestinationIndex; Check, Current: TLineStation): Boolean;
     procedure LoadFromXmlNode(Node: TDOMNode);
     procedure SaveToXmlNode(Node: TDOMNode);
@@ -183 +185 @@
   end;
 
+  TVisualStyle = (vsLondon, vsPrague);
+
   { TEngine }
 
@@ -189 +193 @@
     FDarkMode: Boolean;
     FFullScreen: Boolean;
+    FMovableTracks: Boolean;
     FOnDarkModeChange: TNotifyEvent;
     FOnExit: TNotifyEvent;
     FOnFullScreenChange: TFullScrenChangeEvent;
     FState: TGameState;
+    FStationStyle: TStationStyle;
     FTranslator: TTranslator;
+    FVisualStyle: TVisualStyle;
     LastMousePos: TPoint;
     LastFocusedStation: TMapStation;
@@ -210 +217 @@
     MenuCareer: TMenu;
     MenuGame: TMenu;
+    MenuCustomGame: TMenu;
     LastState: TGameState;
     TimePerSecond: TDateTime;
@@ -220 +228 @@
     GrabbedTrainDirection: Integer;
     LastGrabbedTrain: TMetroTrain;
+    function GetMetroLineThickness: Integer;
     function GetServedDaysCount: Integer;
+    function DestinationIndexToText(DestinationIndex: TDestinationIndex): string;
+    function DestinationIndexToShape(DestinationIndex: TDestinationIndex): TDestinationShape;
     procedure ResizeView(Force: Boolean);
-    function GetExistStationShapes: TStationShapeSet;
+    function GetExistStationDestinationIndex(DestinationIndex: TDestinationIndex): Boolean;
     function GetStationOnPos(Pos: TPoint): TMapStation;
     function GetTrackOnPos(Pos: TPoint; out Intersect: TPoint): TTrackLink;
@@ -229 +240 @@
     procedure DrawFrame(Canvas: TCanvas; Rect: TRect);
     procedure DrawLine(Canvas: TCanvas; Pos: TPoint);
-    procedure DrawShape(Canvas: TCanvas; Position: TPoint; Shape: TStationShape;
+    procedure DrawShape(Canvas: TCanvas; Position: TPoint; Shape: TDestinationShape;
       Size: Integer; Angle: Double);
     procedure DrawClock(Canvas: TCanvas; CanvasSize: TPoint);
@@ -244 +255 @@
     procedure DrawGrabbed(Canvas: TCanvas; CanvasSize: TPoint);
     procedure ComputeShapeDistance;
-    procedure ComputeShapeDistanceStation(Station: TMapStation;
-      UpdatedShape: TStationShape; Distance: Integer);
+    procedure ComputeDestinationIndexDistanceStation(Station: TMapStation;
+      UpdatedDestinationIndex: TDestinationIndex; Distance: Integer);
     procedure SetDarkMode(AValue: Boolean);
     procedure SetFullScreen(AValue: Boolean);
@@ -258 +269 @@
     procedure MenuItemCareer(Sender: TObject);
     procedure MenuItemOptions(Sender: TObject);
+    procedure MenuItemCustomGame(Sender: TObject);
+    procedure MenuItemCustomPlay(Sender: TObject);
     procedure MenuItemGameContinue(Sender: TObject);
     procedure MenuItemGameExit(Sender: TObject);
@@ -272 +285 @@
     procedure LanguageChanged(Sender: TObject);
     procedure FullScreenChanged(Sender: TObject);
+    procedure MovableTrackChanged(Sender: TObject);
+    procedure StationStyleChanged(Sender: TObject);
+    procedure VisualStyleChanged(Sender: TObject);
     procedure UpdateInterface;
     function GetImprovementText(Improvement: TMetroImprovement): string;
@@ -288 +304 @@
     Trains: TMetroTrains;
     Carriages: TMetroCarriages;
-    ShapeCount: Integer;
+    DestinationCount: Integer;
     Map: TMap;
     View: TView;
@@ -344 +360 @@
     property ServedDaysCount: Integer read GetServedDaysCount;
   published
+    property MovableTracks: Boolean read FMovableTracks write FMovableTracks;
+    property VisualStyle: TVisualStyle read FVisualStyle write FVisualStyle;
+    property StationStyle: TStationStyle read FStationStyle write FStationStyle;
     property DarkMode: Boolean read FDarkMode write SetDarkMode;
     property FullScreen: Boolean read FFullScreen write SetFullScreen;
@@ -402 +421 @@
   STrain = 'Train';
   SPlay = 'Play';
+  SCustomGame = 'Custom game';
   SOptions = 'Options';
   SExit = 'Exit';
@@ -407 +427 @@
   SDarkMode = 'Dark mode';
   SLanguage = 'Language';
+  SMovableTrack = 'Movable track';
   SCzech = 'Czech';
   SEnglish = 'English';
@@ -425 +446 @@
   SUnlockedCity = 'City %s is now unlocked.';
   SWrongFileFormat = 'Wrong file format';
+  SVisualStyle = 'Visual style';
+  SStationStyle = 'Station style';
 
   // Cities
@@ -435 +458 @@
   SSeoul = 'Seoul';
   SBeijing = 'Beijing';
+
+  // Station styles
+  SShapes = 'Shapes';
+  SLinear = 'Linear';
+  SAlpha = 'Alpha';
+
+var
+  StationStyleText: array[TStationStyle] of string = (SShapes, SLinear, SAlpha);
+  VisualStyleText: array[TVisualStyle] of string = (SLondon, SPrague);
 
 { TClock }
@@ -659 +691 @@
   until (MinD > StationMinDistance) or
     (Pass > 1000) or (Engine.Stations.Count = 0);
-  Result.Shape := TStationShape(Random(Integer(Engine.ShapeCount)));
+  Result.DestinationIndex := Random(Engine.DestinationCount);
   Add(Result);
   Engine.ComputeShapeDistance;
@@ -1139 +1171 @@
         // Get orthogonal angle
         HAngle := (Angle + Pi / 2) mod Pi;
-        NewShift.X := Trunc(MetroLineThickness * Cos(HAngle) * (J - (TrackLinks.Count - 1) / 2));
-        NewShift.Y := Trunc(MetroLineThickness * Sin(HAngle) * (J - (TrackLinks.Count - 1) / 2));
+        NewShift.X := Trunc(Engine.GetMetroLineThickness * Cos(HAngle) * (J - (TrackLinks.Count - 1) / 2));
+        NewShift.Y := Trunc(Engine.GetMetroLineThickness * Sin(HAngle) * (J - (TrackLinks.Count - 1) / 2));
         Shift := NewShift;
       end;
@@ -1167 +1199 @@
 end;
 
-function TMapStation.IsBestStationForShape(Shape: TStationShape;
+function TMapStation.IsBestStationForShape(DestinationIndex: TDestinationIndex;
   Check, Current: TLineStation): Boolean;
 var
@@ -1213 +1245 @@
       end else DirectionUp := False;
     end;
-    if DirectionDown and (NextStationDown.MapStation.ShapeDistance[Shape] <> -1) and
-      (NextStationDown.MapStation.ShapeDistance[Shape] < Distance) then begin
-      Distance := NextStationDown.MapStation.ShapeDistance[Shape];
-    end;
-    if DirectionUp and (NextStationUp.MapStation.ShapeDistance[Shape] <> -1) and
-      (NextStationUp.MapStation.ShapeDistance[Shape] < Distance) then begin
-      Distance := NextStationUp.MapStation.ShapeDistance[Shape];
-    end;
-  end;
-  Result := (Check.MapStation.ShapeDistance[Shape] <> -1) and
-    (Check.MapStation.ShapeDistance[Shape] <= Distance);
+    if DirectionDown and (NextStationDown.MapStation.DestinationDistance[DestinationIndex] <> -1) and
+      (NextStationDown.MapStation.DestinationDistance[DestinationIndex] < Distance) then begin
+      Distance := NextStationDown.MapStation.DestinationDistance[DestinationIndex];
+    end;
+    if DirectionUp and (NextStationUp.MapStation.DestinationDistance[DestinationIndex] <> -1) and
+      (NextStationUp.MapStation.DestinationDistance[DestinationIndex] < Distance) then begin
+      Distance := NextStationUp.MapStation.DestinationDistance[DestinationIndex];
+    end;
+  end;
+  Result := (Check.MapStation.DestinationDistance[DestinationIndex] <> -1) and
+    (Check.MapStation.DestinationDistance[DestinationIndex] <= Distance);
 end;
 
@@ -1230 +1262 @@
   Position.X := ReadInteger(Node, 'PositionX', Position.X);
   Position.Y := ReadInteger(Node, 'PositionY', Position.Y);
-  Shape := TStationShape(ReadInteger(Node, 'Shape', Integer(Shape)));
+  DestinationIndex := ReadInteger(Node, 'DestinationIndex', Integer(DestinationIndex));
   IsTerminal := ReadBoolean(Node, 'IsTerminal', IsTerminal);
 end;
@@ -1238 +1270 @@
   WriteInteger(Node, 'PositionX', Position.X);
   WriteInteger(Node, 'PositionY', Position.Y);
-  WriteInteger(Node, 'Shape', Integer(Shape));
+  WriteInteger(Node, 'DestinationIndex', DestinationIndex);
   WriteBoolean(Node, 'IsTerminal', IsTerminal);
 end;
@@ -1248 +1280 @@
   Lines := TMetroLines.Create;
   Lines.OwnsObjects := False;
+  SetLength(DestinationDistance, Integer(High(TDestinationShape)) + 1);
 end;
 
@@ -1287 +1320 @@
 end;
 
+function TEngine.GetMetroLineThickness: Integer;
+begin
+  case VisualStyle of
+    vsLondon: Result := MetroLineThickness;
+    vsPrague: Result := Round(3 * MetroLineThickness);
+  end;
+end;
+
 function TEngine.GetServedDaysCount: Integer;
 begin
@@ -1292 +1333 @@
 end;
 
-function TEngine.GetExistStationShapes: TStationShapeSet;
+function TEngine.GetExistStationDestinationIndex(
+  DestinationIndex: TDestinationIndex): Boolean;
 var
   Station: TMapStation;
 begin
-  Result := [];
+  Result := False;
   for Station in Stations do
-    Result := Result + [Station.Shape];
+    if Station.DestinationIndex = DestinationIndex then
+      Result := True;
 end;
 
@@ -1409 +1452 @@
 end;
 
-procedure TEngine.DrawShape(Canvas: TCanvas; Position: TPoint; Shape: TStationShape;
+procedure TEngine.DrawShape(Canvas: TCanvas; Position: TPoint; Shape: TDestinationShape;
   Size: Integer; Angle: Double);
 var
@@ -1539 +1582 @@
 procedure TEngine.ComputeShapeDistance;
 var
-  S: TStationShape;
+  S: TDestinationIndex;
   Station: TMapStation;
 begin
@@ -1545 +1588 @@
   for Station in Stations do
   with Station do begin
-    for S := Low(ShapeDistance) to High(ShapeDistance) do
-      ShapeDistance[S] := -1;
+    for S := Low(DestinationDistance) to High(DestinationDistance) do
+      DestinationDistance[S] := -1;
   end;
 
@@ -1553 +1596 @@
   for Station in Stations do
   with Station do begin
-    ComputeShapeDistanceStation(Station, Shape, 0);
-  end;
-end;
-
-procedure TEngine.ComputeShapeDistanceStation(Station: TMapStation;
-  UpdatedShape: TStationShape; Distance: Integer);
+    ComputeDestinationIndexDistanceStation(Station, DestinationIndex, 0);
+  end;
+end;
+
+procedure TEngine.ComputeDestinationIndexDistanceStation(Station: TMapStation;
+  UpdatedDestinationIndex: TDestinationIndex; Distance: Integer);
 var
   I: Integer;
@@ -1567 +1610 @@
 begin
   with Station do begin
-    if (Distance < ShapeDistance[UpdatedShape]) or (ShapeDistance[UpdatedShape] = -1) then begin
-      ShapeDistance[UpdatedShape] := Distance;
+    if (Distance < DestinationDistance[UpdatedDestinationIndex]) or (DestinationDistance[UpdatedDestinationIndex] = -1) then begin
+      DestinationDistance[UpdatedDestinationIndex] := Distance;
       // Do for all lines connected to station
       for I := 0 to Lines.Count - 1 do
@@ -1577 +1620 @@
           // Update for all adjecent stations
           if StationIndex > 0 then
-            ComputeShapeDistanceStation(LineStations[StationIndex - 1].MapStation,
-            UpdatedShape, Station.ShapeDistance[UpdatedShape] + 1);
+            ComputeDestinationIndexDistanceStation(LineStations[StationIndex - 1].MapStation,
+            UpdatedDestinationIndex, Station.DestinationDistance[UpdatedDestinationIndex] + 1);
           if (StationIndex >= 0) and (StationIndex < LineStations.Count - 1) then
-            ComputeShapeDistanceStation(LineStations[StationIndex + 1].MapStation,
-            UpdatedShape, Station.ShapeDistance[UpdatedShape] + 1);
+            ComputeDestinationIndexDistanceStation(LineStations[StationIndex + 1].MapStation,
+            UpdatedDestinationIndex, Station.DestinationDistance[UpdatedDestinationIndex] + 1);
         end else begin
           // If circular then trains might go in single direction so passengers
@@ -1591 +1634 @@
             if Trains[T].Direction = -1 then DirectionDown := True;
           end;
+
           // Update for all adjecent stations
           if DirectionUp then begin
             if StationIndex = 0 then
-              ComputeShapeDistanceStation(LineStations[LineStations.Count - 2].MapStation,
-              UpdatedShape, Station.ShapeDistance[UpdatedShape] + 1);
+              ComputeDestinationIndexDistanceStation(LineStations[LineStations.Count - 2].MapStation,
+              UpdatedDestinationIndex, Station.DestinationDistance[UpdatedDestinationIndex] + 1);
             if StationIndex > 0 then
-              ComputeShapeDistanceStation(LineStations[StationIndex - 1].MapStation,
-              UpdatedShape, Station.ShapeDistance[UpdatedShape] + 1);
+              ComputeDestinationIndexDistanceStation(LineStations[StationIndex - 1].MapStation,
+              UpdatedDestinationIndex, Station.DestinationDistance[UpdatedDestinationIndex] + 1);
           end;
           if DirectionDown then begin
             if (StationIndex >= 0) and (StationIndex = LineStations.Count - 1) then
-              ComputeShapeDistanceStation(LineStations[1].MapStation,
-              UpdatedShape, Station.ShapeDistance[UpdatedShape] + 1);
+              ComputeDestinationIndexDistanceStation(LineStations[1].MapStation,
+              UpdatedDestinationIndex, Station.DestinationDistance[UpdatedDestinationIndex] + 1);
             if (StationIndex >= 0) and (StationIndex < LineStations.Count - 1) then
-              ComputeShapeDistanceStation(LineStations[StationIndex + 1].MapStation,
-              UpdatedShape, Station.ShapeDistance[UpdatedShape] + 1);
+              ComputeDestinationIndexDistanceStation(LineStations[StationIndex + 1].MapStation,
+              UpdatedDestinationIndex, Station.DestinationDistance[UpdatedDestinationIndex] + 1);
           end;
         end;
@@ -1689 +1733 @@
           if Assigned(CurrentStation) then begin
             for P := Passengers.Count - 1 downto 0 do begin
-              if Passengers[P].Shape = CurrentStation.MapStation.Shape then begin
+              if Passengers[P].DestinationIndex = CurrentStation.MapStation.DestinationIndex then begin
                 Passenger := Passengers[P];
                 Passengers.Delete(P);
@@ -1699 +1743 @@
             with Carriages[J] do begin
               for P := Passengers.Count - 1 downto 0 do begin
-                if Passengers[P].Shape = CurrentStation.MapStation.Shape then begin
+                if Passengers[P].DestinationIndex = CurrentStation.MapStation.DestinationIndex then begin
                   Passenger := Passengers[P];
                   Passengers.Delete(P);
@@ -1712 +1756 @@
           if Assigned(CurrentStation) then begin
             for P := Passengers.Count - 1 downto 0 do begin
-              if not CurrentStation.MapStation.IsBestStationForShape(Passengers[P].Shape,
+              if not CurrentStation.MapStation.IsBestStationForShape(Passengers[P].DestinationIndex,
               TargetStation, CurrentStation) then begin
                 Passenger := Passengers[P];
@@ -1722 +1766 @@
             with Carriages[J] do begin
               for P := Passengers.Count - 1 downto 0 do begin
-                if not CurrentStation.MapStation.IsBestStationForShape(Passengers[P].Shape,
+                if not CurrentStation.MapStation.IsBestStationForShape(Passengers[P].DestinationIndex,
                 TargetStation, CurrentStation) then begin
                   Passenger := Passengers[P];
@@ -1739 +1783 @@
             if (Passengers.Count < TrainPassengerCount) then begin
               Passenger := CurrentStation.MapStation.Passengers[P];
-              if CurrentStation.MapStation.IsBestStationForShape(Passenger.Shape,
+              if CurrentStation.MapStation.IsBestStationForShape(Passenger.DestinationIndex,
               TargetStation, CurrentStation) then begin
                 CurrentStation.MapStation.Passengers.Delete(P);
@@ -1750 +1794 @@
                 if (Passengers.Count < TrainPassengerCount) then begin
                   Passenger := CurrentStation.MapStation.Passengers[P];
-                  if CurrentStation.MapStation.IsBestStationForShape(Passenger.Shape,
+                  if CurrentStation.MapStation.IsBestStationForShape(Passenger.DestinationIndex,
                   TargetStation, CurrentStation) then begin
                     CurrentStation.MapStation.Passengers.Delete(P);
@@ -1935 +1979 @@
 
 procedure TEngine.MenuItemOptions(Sender: TObject);
+var
+  VisualStyleIndex: TVisualStyle;
+  StationStyleIndex: TStationStyle;
 begin
   MenuOptions.Parent := MenuMain;
@@ -1967 +2014 @@
       Checked := FullScreen;
     end;
+      with AddComboBox(SVisualStyle, [], VisualStyleChanged) do begin
+      TextSize := 40;
+      TextColor := Colors.MenuItemText;
+      TextDisabledColor := Colors.MenuItemDisabledText;
+      BackgroundColor := Colors.MenuItemBackground;
+      BackgroundSelectedColor := Colors.MenuItemBackgroundSelected;
+      for VisualStyleIndex := Low(TVisualStyle) to High(TVisualStyle) do
+        States.AddObject(VisualStyleText[VisualStyleIndex], TObject(VisualStyleIndex));
+      Index := States.IndexOfObject(TObject(VisualStyle));
+      if Index = -1 then Index := 0;
+    end;
+    with AddComboBox(SStationStyle, [], StationStyleChanged) do begin
+      TextSize := 40;
+      TextColor := Colors.MenuItemText;
+      TextDisabledColor := Colors.MenuItemDisabledText;
+      BackgroundColor := Colors.MenuItemBackground;
+      BackgroundSelectedColor := Colors.MenuItemBackgroundSelected;
+      for StationStyleIndex := Low(TStationStyle) to High(TStationStyle) do
+        States.AddObject(StationStyleText[StationStyleIndex], TObject(StationStyleIndex));
+      Index := States.IndexOfObject(TObject(StationStyle));
+      if Index = -1 then Index := 0;
+    end;
+    with AddCheckBox(SMovableTrack, MovableTrackChanged) do begin
+      TextSize := 40;
+      TextColor := Colors.MenuItemText;
+      TextDisabledColor := Colors.MenuItemDisabledText;
+      BackgroundColor := Colors.MenuItemBackground;
+      BackgroundSelectedColor := Colors.MenuItemBackgroundSelected;
+      Checked := MovableTracks;
+    end;
     with AddButton(SBack, MenuItemBack) do begin
       TextSize := 40;
@@ -1981 +2058 @@
 end;
 
+procedure TEngine.MenuItemCustomGame(Sender: TObject);
+var
+  VisualStyleIndex: TVisualStyle;
+  StationStyleIndex: TStationStyle;
+begin
+  MenuCustomGame.Parent := MenuMain;
+  with MenuCustomGame, Items do begin
+    Clear;
+    with AddButton(SPlay, MenuItemCustomPlay) do begin
+      TextSize := 40;
+      TextColor := Colors.MenuItemText;
+      TextDisabledColor := Colors.MenuItemDisabledText;
+      BackgroundColor := Colors.MenuItemBackground;
+      BackgroundSelectedColor := Colors.MenuItemBackgroundSelected;
+    end;
+    with AddButton(SBack, MenuItemBack) do begin
+      TextSize := 40;
+      TextColor := Colors.MenuItemText;
+      TextDisabledColor := Colors.MenuItemDisabledText;
+      BackgroundColor := Colors.MenuItemBackground;
+      BackgroundSelectedColor := Colors.MenuItemBackgroundSelected;
+    end;
+    OnExit := MenuItemBack;
+  end;
+
+  Menu := MenuCustomGame;
+  Redraw;
+end;
+
+procedure TEngine.MenuItemCustomPlay(Sender: TObject);
+begin
+  City := nil;
+  NewGame;
+end;
+
 procedure TEngine.MenuItemBack(Sender: TObject);
 begin
@@ -2112 +2224 @@
 end;
 
+procedure TEngine.MovableTrackChanged(Sender: TObject);
+begin
+  MovableTracks := TMenuItemCheckBox(Sender).Checked;
+end;
+
+procedure TEngine.StationStyleChanged(Sender: TObject);
+begin
+  StationStyle := TStationStyle(TMenuItemComboBox(Sender).States.Objects[TMenuItemComboBox(Sender).Index]);
+end;
+
+procedure TEngine.VisualStyleChanged(Sender: TObject);
+begin
+  VisualStyle := TVisualStyle(TMenuItemComboBox(Sender).States.Objects[TMenuItemComboBox(Sender).Index]);
+end;
+
 procedure TEngine.UpdateInterface;
 begin
@@ -2198 +2325 @@
     miTerminal: Inc(AvailableTerminals);
   end;
+end;
+
+function TEngine.DestinationIndexToText(DestinationIndex: TDestinationIndex): string;
+begin
+  case StationStyle of
+    ssShapes: Result := '';
+    ssAlpha: Result := Chr(Ord('A') + Integer(DestinationIndex));
+    ssLinear: Result := IntToStr(1 + Integer(DestinationIndex));
+  end;
+end;
+
+function TEngine.DestinationIndexToShape(DestinationIndex: TDestinationIndex): TDestinationShape;
+begin
+  if StationStyle = ssShapes then Result := TDestinationShape(DestinationIndex)
+    else Result := ssCircle;
 end;
 
@@ -2226 +2368 @@
       BackgroundSelectedColor := Colors.MenuItemBackgroundSelected;
     end;
+    {
+    with AddButton(SCustomGame, MenuItemCustomGame) do begin
+      TextSize := 40;
+      TextColor := Colors.MenuItemText;
+      TextDisabledColor := Colors.MenuItemDisabledText;
+      BackgroundColor := Colors.MenuItemBackground;
+      BackgroundSelectedColor := Colors.MenuItemBackgroundSelected;
+    end;
+    }
     with AddButton(SCareer, MenuItemCareer) do begin
       TextSize := 40;
@@ -2351 +2502 @@
   Carriage: TMetroCarriage;
   Vector: TVector;
+  Text: string;
 begin
   for Train in Trains do
@@ -2357 +2509 @@
       Canvas.Brush.Color := Line.Color;
       Canvas.Brush.Style := bsSolid;
-      Canvas.Pen.Style := psClear;
+      Canvas.Pen.Width := 1;
+      case VisualStyle of
+        vsLondon: Canvas.Pen.Style := psClear;
+        vsPrague: begin
+          Canvas.Pen.Style := psSolid;
+          Canvas.Pen.Color := Colors.Text;
+        end;
+      end;
       Vector := TrackPosition.GetVector;
       Pos := Vector.Position;
@@ -2368 +2527 @@
       Points[3] := RotatePoint(Pos, Point(Pos.X - TrainSize div 2, Pos.Y + TrainSize div 3), Angle);
       Canvas.Polygon(Points);
+
+      Canvas.Pen.Style := psClear;
       Canvas.Brush.Color := clWhite;
       P := 0;
@@ -2375 +2536 @@
           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);
+        if StationStyle = ssShapes then begin
+          DrawShape(Canvas, ShapePos, DestinationIndexToShape(DestinationIndex), TrainSize div 3, Angle + Pi / 2);
+        end else begin
+          Text := DestinationIndexToText(DestinationIndex);
+          if Text <> '' then begin
+            Canvas.Brush.Style := bsClear;
+            Canvas.Font.Color := clWhite;
+            Canvas.Font.Size := Round(TrainSize * 0.15);
+            Canvas.Font.Orientation := Round((-Angle / Pi * 180) * 10);
+            Canvas.TextOut(ShapePos.X - Round(TrainSize * 0.15),
+              ShapePos.Y - Round(TrainSize * 0.15), Text);
+            Canvas.Font.Orientation := 0;
+          end;
+        end;
         Inc(P);
       end;
@@ -2384 +2558 @@
         Canvas.Brush.Color := Line.Color;
         Canvas.Brush.Style := bsSolid;
-        Canvas.Pen.Style := psClear;
+        case VisualStyle of
+          vsLondon: Canvas.Pen.Style := psClear;
+          vsPrague: begin
+            Canvas.Pen.Style := psSolid;
+            Canvas.Pen.Color := Colors.Text;
+          end;
+        end;
         Vector := GetTrackPosition.GetVector;
         Pos := Vector.Position;
@@ -2395 +2575 @@
         Points[3] := RotatePoint(Pos, Point(Pos.X - TrainSize div 2, Pos.Y + TrainSize div 3), Angle);
         Canvas.Polygon(Points);
+
+        Canvas.Pen.Style := psClear;
         Canvas.Brush.Color := clWhite;
         P := 0;
@@ -2402 +2584 @@
             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);
+          if StationStyle = ssShapes then begin
+            DrawShape(Canvas, ShapePos, DestinationIndexToShape(DestinationIndex), TrainSize div 3, Angle + Pi / 2);
+          end else begin
+            Text := DestinationIndexToText(DestinationIndex);
+            if Text <> '' then begin
+              Canvas.Brush.Style := bsClear;
+              Canvas.Font.Color := clWhite;
+              Canvas.Font.Size := Round(TrainSize * 0.15);
+              Canvas.Font.Orientation := Round((-Angle / Pi * 180) * 10);
+              Canvas.TextOut(ShapePos.X - Round(TrainSize * 0.15),
+                ShapePos.Y - Round(TrainSize * 0.15), Text);
+              Canvas.Font.Orientation := 0;
+            end;
+          end;
           Inc(P);
         end;
@@ -2672 +2867 @@
     Canvas.Pen.Color := Color;
     Canvas.Pen.Style := psSolid;
-    Canvas.Pen.Width := MetroLineThickness;
+    Canvas.Pen.Width := GetMetroLineThickness;
     if Track.Points.Count > 0 then Canvas.MoveTo(Track.Points[0].Position);
     for S := 1 to Track.Points.Count - 1 do begin
@@ -2692 +2887 @@
 (*    Canvas.Pen.Color := Color;
     Canvas.Pen.Style := psSolid;
-    Canvas.Pen.Width := MetroLineThickness div 2;
+    Canvas.Pen.Width := GetMetroLineThickness div 2;
     if Track.Points.Count > 0 then Canvas.MoveTo(Track.Points[0].PositionDesigned);
     for S := 1 to Track.Points.Count - 1 do begin
@@ -2748 +2943 @@
   Direction: Integer;
   UsedStationSize: Integer;
+  Text: string;
 begin
   Canvas.Pen.Width := 5;
@@ -2757 +2953 @@
 
     if Assigned(SelectedLine) and (Lines.IndexOf(SelectedLine) <> -1) then begin
+      case VisualStyle of
+        vsLondon: begin
+          Canvas.Brush.Style := bsClear;
+          Canvas.Pen.Style := psSolid;
+          Canvas.Pen.Color := SelectedLine.Color;
+        end;
+        vsPrague: begin
+          Canvas.Brush.Style := bsSolid;
+          Canvas.Brush.Color := SelectedLine.Color;
+          Canvas.Pen.Style := psClear;
+          Canvas.Pen.Color := Colors.Background;
+        end;
+      end;
+      DrawShape(Canvas, Position, DestinationIndexToShape(Integer(DestinationIndex)),
+        UsedStationSize + Canvas.Pen.Width + 4, 0);
+    end;
+
+    case VisualStyle of
+      vsLondon: begin
+        Canvas.Brush.Style := bsSolid;
+        Canvas.Brush.Color := Colors.ShapeBackground;
+        Canvas.Pen.Color := Colors.Text;
+      end;
+      vsPrague: begin
+        if Lines.Count = 0 then begin
+          Canvas.Brush.Style := bsSolid;
+          Canvas.Brush.Color := Colors.Background2;
+        end else Canvas.Brush.Style := bsClear;
+        Canvas.Pen.Style := psClear;
+      end;
+    end;
+    DrawShape(Canvas, Position, DestinationIndexToShape(Integer(DestinationIndex)),
+      UsedStationSize, 0);
+    Text := DestinationIndexToText(Integer(DestinationIndex));
+    if Text <> '' then begin
       Canvas.Brush.Style := bsClear;
-      Canvas.Pen.Color := SelectedLine.Color;
-      DrawShape(Canvas, Position, Shape, UsedStationSize + Canvas.Pen.Width + 4, 0);
-    end;
-
-    Canvas.Brush.Color := Colors.ShapeBackground;
-    Canvas.Brush.Style := bsSolid;
-    Canvas.Pen.Color := Colors.Text;
-    DrawShape(Canvas, Position, Shape, UsedStationSize, 0);
+      Canvas.Font.Size := Round(UsedStationSize * 0.4);
+      Canvas.Font.Color := Colors.Text;
+      Canvas.Font.Style := [fsBold];
+      Canvas.TextOut(Position.X - Canvas.TextWidth(Text) div 2,
+        Position.Y - Canvas.TextHeight(Text) div 2, Text);
+    end;
+
+    // Draw station border
+    if (VisualStyle = vsPrague) and (Lines.Count > 0) then begin
+      Canvas.Brush.Style := bsClear;
+      Canvas.Pen.Style := psSolid;
+      Canvas.Pen.Color := Colors.Background;
+      DrawShape(Canvas, Position, DestinationIndexToShape(Integer(DestinationIndex)),
+        UsedStationSize + Canvas.Pen.Width + 4, 0);
+    end;
 
     // Draw passengers
@@ -2774 +3012 @@
     for Passenger in Passengers do
     with Passenger do begin
-      DrawShape(Canvas, Point(Position.X + StationSize + PassengerPos.X,
-        Position.Y - StationSize div 2 + PassengerPos.Y),
-        Shape, PassengerSize, 0);
+      if StationStyle = ssShapes then begin
+        DrawShape(Canvas, Point(Position.X + StationSize + PassengerPos.X,
+          Position.Y - StationSize div 2 + PassengerPos.Y),
+          DestinationIndexToShape(DestinationIndex), PassengerSize, 0);
+      end else begin
+        Text := DestinationIndexToText(Integer(DestinationIndex));
+        if Text <> '' then begin
+          Canvas.Brush.Style := bsClear;
+          Canvas.Font.Size := Round(StationSize * 0.3);
+          Canvas.Font.Color := Colors.Text;
+          Canvas.Font.Style := [fsBold];
+          Canvas.TextOut(Position.X + StationSize + PassengerPos.X - Canvas.TextWidth(Text) div 2,
+            Position.Y - StationSize div 2 + PassengerPos.Y - Canvas.TextHeight(Text) div 2, Text);
+        end;
+      end;
       PassengerPos := Point(PassengerPos.X + Direction * (PassengerSize + 2), PassengerPos.Y);
       if PassengerPos.X >= (PassengerSize + 2) * VisiblePassengersPerLine then begin
@@ -2794 +3044 @@
       Text := '';
       for P := 0 to 5 do
-        Text := Text + IntToStr(ShapeDistance[TStationShape(P)]) + ',';
+        Text := Text + IntToStr(DestinationDistance[TDestinationIndex(P)]) + ',';
       Canvas.TextOut(Position.X + StationSize div 2, Position.Y + StationSize div 2, Text);
     end;
@@ -3036 +3286 @@
     if (Time - LastNewShapeTime) > NewShapePeriod then begin
       LastNewShapeTime := Time;
-      if ShapeCount <= Integer(High(TStationShape)) then Inc(ShapeCount);
+      if DestinationCount < Integer(High(TDestinationShape)) then Inc(DestinationCount);
       Redraw;
     end;
@@ -3055 +3305 @@
       if Random < NewPassengerProbability then begin
         Passenger := Self.Passengers.AddNew;
-        Passenger.Shape := TStationShape(Random(Integer(ShapeCount)));
+        Passenger.DestinationIndex := Random(DestinationCount);
         Passengers.Add(Passenger);
 
-        // Passenger is not allowed to have same shape
-        while (Passenger.Shape = Shape) or
-        not (Passenger.Shape in GetExistStationShapes) do
-          Passenger.Shape := TStationShape((Integer(Passenger.Shape) + 1) mod Integer(ShapeCount));
+        // Passenger is not allowed to have same DestinationIndex
+        while (Passenger.DestinationIndex = DestinationIndex) or
+        not GetExistStationDestinationIndex(Passenger.DestinationIndex) do
+          Passenger.DestinationIndex := (Passenger.DestinationIndex + 1) mod DestinationCount;
         Redraw;
       end;
@@ -3134 +3384 @@
     if Assigned(Line) and not Assigned(LastFocusedStation) and Assigned(FocusedStation) then begin
       if Assigned(TrackStationDown) and (TLineStation(TrackStationDown.OwnerPoint).MapStation = FocusedStation) then begin
-        // Disconnect down
-        CurrentTrackPoint := TrackStationDown;
-        TrackStationDown := TrackStationDown.GetDown;
-        Line.DisconnectStation(TLineStation(CurrentTrackPoint.OwnerPoint));
+        if MovableTracks then begin
+          // Disconnect down
+          CurrentTrackPoint := TrackStationDown;
+          TrackStationDown := TrackStationDown.GetDown;
+          Line.DisconnectStation(TLineStation(CurrentTrackPoint.OwnerPoint));
+        end;
       end else
       if Assigned(TrackStationUp) and (TLineStation(TrackStationUp.OwnerPoint).MapStation = FocusedStation) then begin
-        // Disconnect up
-        CurrentTrackPoint := TrackStationUp;
-        if Assigned(TrackStationUp) then
-          TrackStationUp := TrackStationUp.GetUp;
-        Line.DisconnectStation(TLineStation(CurrentTrackPoint.OwnerPoint));
+        if MovableTracks then begin
+          // Disconnect up
+          CurrentTrackPoint := TrackStationUp;
+          if Assigned(TrackStationUp) then
+            TrackStationUp := TrackStationUp.GetUp;
+          Line.DisconnectStation(TLineStation(CurrentTrackPoint.OwnerPoint));
+        end;
       end else
       if Assigned(Line) and ((not Line.IsCircular) or ((TrackStationDown <> nil) and (TrackStationUp <> nil))) and
@@ -3361 +3615 @@
             else TrackStationUp := nil;
         end;
+
+        if not MovableTracks and (Assigned(TrackStationDown) and Assigned(TrackStationUp)) then begin
+          TrackStationDown := nil;
+          TrackStationUp := nil;
+          SelectedLine := nil;
+        end;
+
         Track.Free;
         Exit;
@@ -3491 +3752 @@
   end;
   AvailableImprovements := [miCarriage, miLine, miTerminal];
-  ShapeCount := 3;
+  DestinationCount := 3;
 
   // Start with 3 stations with each different shape
@@ -3497 +3758 @@
   for I := 0 to InitialStationCount - 1 do begin
     NewStation := Stations.AddNew;
-    if I = 0 then NewStation.Shape := ssSquare
-    else if I = 1 then NewStation.Shape := ssCircle
-    else if I = 2 then NewStation.Shape := ssTriangle;
+    if I = 0 then NewStation.DestinationIndex := Integer(ssSquare)
+    else if I = 1 then NewStation.DestinationIndex := Integer(ssCircle)
+    else if I = 2 then NewStation.DestinationIndex := Integer(ssTriangle);
   end;
 
@@ -3534 +3795 @@
     HighestServedPassengerCount := ReadIntegerWithDefault('HighestPassengers', 0);
     HighestServedDaysCount := ReadIntegerWithDefault('HighestDays', 0);
+    StationStyle := TStationStyle(ReadIntegerWithDefault('StationStyle', Integer(ssShapes)));
+    VisualStyle := TVisualStyle(ReadIntegerWithDefault('VisualStyle', Integer(vsLondon)));
+    MovableTracks := ReadBoolWithDefault('MovableTracks', MovableTracks);
     Cities.LoadFromRegistry(TRegistryContext.Create(RegistryContext.RootKey, RegistryContext.Key + '\Cities'));
   finally
@@ -3549 +3813 @@
     WriteInteger('HighestPassengers', HighestServedPassengerCount);
     WriteInteger('HighestDays', HighestServedDaysCount);
+    WriteInteger('StationStyle', Integer(StationStyle));
+    WriteInteger('VisualStyle', Integer(VisualStyle));
+    WriteBool('MovableTracks', MovableTracks);
     Cities.SaveToRegistry(TRegistryContext.Create(RegistryContext.RootKey, RegistryContext.Key + '\Cities'));
   finally
@@ -3625 +3892 @@
 begin
   inherited;
+  MovableTracks := True;
   Colors := TColors.Create;
   Colors.Init(FDarkMode);
@@ -3639 +3907 @@
   MenuCareer := TMenu.Create;
   MenuGame := TMenu.Create;
+  MenuCustomGame := TMenu.Create;
   Menu := MenuMain;
   InitMenus;
@@ -3699 +3968 @@
   FreeAndNil(MenuMain);
   FreeAndNil(MenuOptions);
+  FreeAndNil(MenuCustomGame);
   FreeAndNil(MenuCareer);
   FreeAndNil(MenuGame);