Changeset 100 for trunk/UEngine.pas

Timestamp:

Sep 28, 2022, 7:14:22 PM (20 months ago)

Author:

chronos

Message:

• Added: New game mode carrier where user needs to play existing cities and gradually unlock them by reaching exprected transported number of passengers.

File:

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

trunk/UEngine.pas

@@ -85 +85 @@
   TMetroLines = class(TObjectList<TMetroLine>)
     Engine: TEngine;
-    function AddNew: TMetroLine;
+    function AddNew(Color: TColor): TMetroLine;
     function SearchByColor(Color: TColor): TMetroLine;
   end;
@@ -141 +141 @@
   end;
 
+  { TMap }
+
   TMap = class
     Size: TPoint;
@@ -149 +151 @@
 
   TGameState = (gsNotStarted, gsRunning, gsPaused, gsGameOver, gsMenu, gsNewWeek,
-    gsNewImprovement);
-
-  TMetroImprovement = (miNone, miTunnel, miTerminal, miLine, miCarriage);
+    gsNewImprovement, gsSuccess);
+
+  TMetroImprovement = (miNone, miTunnel, miTerminal, miLine, miCarriage,
+    miFastTrain);
   TMetroImprovementSet = set of TMetroImprovement;
 
@@ -175 +178 @@
     MenuMain: TMenu;
     MenuOptions: TMenu;
+    MenuCareer: TMenu;
     MenuGame: TMenu;
     LastState: TGameState;
@@ -180 +184 @@
     ImprovementImageSize: Integer;
     IconSize: Integer;
+    LineColors: array of TColor;
     function GetServedDaysCount: Integer;
     procedure ResizeView;
@@ -194 +199 @@
     procedure DrawTrains(Canvas: TCanvas);
     procedure DrawGameOver(Canvas: TCanvas; CanvasSize: TPoint);
+    procedure DrawHighScore(Canvas: TCanvas; CanvasSize: TPoint; Y: Integer);
+    procedure DrawSuccess(Canvas: TCanvas; CanvasSize: TPoint);
     procedure DrawNewWeek(Canvas: TCanvas; CanvasSize: TPoint);
     procedure DrawNewImprovement(Canvas: TCanvas; CanvasSize: TPoint);
@@ -209 +216 @@
     procedure ShiftTrackPoints;
     procedure MenuItemExit(Sender: TObject);
+    procedure MenuItemCity(Sender: TObject);
     procedure MenuItemPlay(Sender: TObject);
+    procedure MenuItemCareer(Sender: TObject);
     procedure MenuItemOptions(Sender: TObject);
     procedure MenuItemGameContinue(Sender: TObject);
@@ -226 +235 @@
     procedure FullScreenChanged(Sender: TObject);
     procedure UpdateInterface;
-    procedure InitCities;
     function GetImprovementText(Improvement: TMetroImprovement): string;
     function GetImprovementBitmap(Improvement: TMetroImprovement): TBitmap;
@@ -242 +250 @@
     View: TView;
     Cities: TCities;
+    City: TCity;
     SelectedLine: TMetroLine;
     SelectedTrain: TMetroTrain;
@@ -255 +264 @@
     ImagePause: TImage;
     ImageFastForward: TImage;
+    ImageAchievement: TImage;
     ImageCarriage: TImage;
     ImageTerminal: TImage;
@@ -267 +277 @@
     HighestServedPassengerCount: Integer;
     HighestServedDaysCount: Integer;
+    RegistryContext: TRegistryContext;
     procedure InitMenus;
+    procedure InitCities;
     procedure MouseMove(Position: TPoint);
     procedure MouseUp(Button: TMouseButton; Position: TPoint);
@@ -276 +288 @@
     procedure NewGame;
     procedure Redraw;
-    procedure LoadFromRegistry(Context: TRegistryContext);
-    procedure SaveToRegistry(Context: TRegistryContext);
+    procedure LoadFromRegistry;
+    procedure SaveToRegistry;
     constructor Create;
     destructor Destroy; override;
@@ -291 +303 @@
 
 const
-  clDarkYellow = TColor($00dede);
-  clOrange = TColor($0080ff);
-  clBrown = TColor($003090);
-  clCyan = TColor($FFFF00);
-  LineColors: array[0..8] of TColor = (clBlue, clRed, clDarkYellow, clGreen,
-    clPurple, clGray, clOrange, clBrown, clCyan);
   StationSize = 30;
   StationOverloadSize = 60;
@@ -352 +358 @@
   SFrench = 'French';
   SGerman = 'German';
+  SAutomatic = 'Automatic';
   SBack = 'Back';
-  SAutomatic = 'Automatic';
   SFullScreen = 'Full screen';
   SContinue = 'Continue';
@@ -361 +367 @@
   SCarriage = 'Carriage';
   STunnel = 'Tunnel';
+  SCareer = 'Career';
+  SSuccess = 'Success';
+  SSuccessReason = 'Your metro transported enough passengers and you have reached your goal for this city.';
+  SUnlockedCity = 'City %s is now unlocked.';
 
   // Cities
@@ -532 +542 @@
 { TMetroLines }
 
-function TMetroLines.AddNew: TMetroLine;
+function TMetroLines.AddNew(Color: TColor): TMetroLine;
 begin
   Result := TMetroLine.Create;
-  Result.Color := LineColors[Count];
   Result.Engine := Engine;
   Result.Index := Count;
+  Result.Color := Color;
   Add(Result);
 end;
@@ -1694 +1704 @@
 end;
 
+procedure TEngine.MenuItemCity(Sender: TObject);
+begin
+  if Sender is TMenuItemButton then begin;
+    City := TCity(TMenuItemButton(Sender).Ref);
+    NewGame;
+  end;
+end;
+
 procedure TEngine.MenuItemPlay(Sender: TObject);
 begin
+  City := nil;
   NewGame;
 end;
 
+procedure TEngine.MenuItemCareer(Sender: TObject);
+var
+  City: TCity;
+begin
+  MenuCareer.Parent := MenuMain;
+  with MenuCareer, Items do begin
+    Clear;
+    for City in Cities do
+    with AddButton(City.Name, MenuItemCity) do begin
+      Ref := City;
+      Enabled := not City.Locked;
+      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 := MenuCareer;
+  Redraw;
+end;
+
 procedure TEngine.MenuItemOptions(Sender: TObject);
 begin
+  MenuOptions.Parent := MenuMain;
+  with MenuOptions, Items do begin
+    Clear;
+    with AddComboBox(SLanguage, [], LanguageChanged) do begin
+      TextSize := 40;
+      TextColor := Colors.MenuItemText;
+      TextDisabledColor := Colors.MenuItemDisabledText;
+      BackgroundColor := Colors.MenuItemBackground;
+      BackgroundSelectedColor := Colors.MenuItemBackgroundSelected;
+      FormMain.Translator1.LanguageListToStrings(States);
+      Index := States.IndexOfObject(FormMain.Translator1.Language);
+      if Index = -1 then Index := 0;
+    end;
+    with AddCheckBox(SDarkMode, DarkModeChanged) do begin
+      TextSize := 40;
+      TextColor := Colors.MenuItemText;
+      TextDisabledColor := Colors.MenuItemDisabledText;
+      BackgroundColor := Colors.MenuItemBackground;
+      BackgroundSelectedColor := Colors.MenuItemBackgroundSelected;
+      Checked := DarkMode;
+    end;
+    with AddCheckBox(SFullScreen, FullScreenChanged) do begin
+      TextSize := 40;
+      TextColor := Colors.MenuItemText;
+      TextDisabledColor := Colors.MenuItemDisabledText;
+      BackgroundColor := Colors.MenuItemBackground;
+      BackgroundSelectedColor := Colors.MenuItemBackgroundSelected;
+      Checked := FormMain.FullScreen;
+    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 := MenuOptions;
   Redraw;
@@ -1791 +1880 @@
 begin
   State := LastState;
+  Redraw;
 end;
 
@@ -1821 +1911 @@
     FormMain.Translator1.Translate;
     InitMenus;
+
+    // Recreate cities with translated names
+    SaveToRegistry;
+    InitCities;
+    LoadFromRegistry;
   end;
 end;
@@ -1838 +1933 @@
 
 procedure TEngine.InitCities;
+var
+  I: Integer;
 begin
   with Cities do begin
-    AddNew(SLondon);
-    AddNew(SNewYork);
-    AddNew(SPrague);
-    AddNew(SParis);
-    AddNew(STokyo);
-  end;
+    Clear;
+    with AddNew('Prague', SPrague, 1275406) do begin
+      LineColors := [clRed, clGreen, clYellow];
+      InitialLineCount := 1;
+      PassengersCountToUnlock := 200;
+    end;
+    with AddNew('Paris', SParis, 2138551) do begin
+      LineColors := [clRed, clGreen, clYellow, clBlue, clBrown, clOrange,
+        clPurple, clOlive, clAqua, clDarkYellow, clPink];
+      InitialLineCount := 1;
+      PassengersCountToUnlock := 300;
+    end;
+    with AddNew('Rome', SRome, 2872800) do begin
+      LineColors := [clRed, clGreen, clYellow];
+      InitialLineCount := 1;
+      PassengersCountToUnlock := 500;
+    end;
+    with AddNew('NewYork', SNewYork, 8804190) do begin
+      InitialLineCount := 1;
+      PassengersCountToUnlock := 700;
+    end;
+    with AddNew('London', SLondon, 9002488) do begin
+      InitialLineCount := 3;
+      PassengersCountToUnlock := 1000;
+    end;
+    with AddNew('Tokyo', STokyo, 13960236) do begin
+      InitialLineCount := 3;
+      PassengersCountToUnlock := 2000;
+    end;
+  end;
+  for I := 1 to Cities.Count - 1 do
+    Cities[I].Locked := True;
 end;
 
@@ -1871 +1994 @@
 begin
   case Improvement of
-    miLine: Lines.AddNew;
+    miLine: Lines.AddNew(LineColors[Lines.Count]);
     miCarriage: Carriages.AddNew;
     //miTunnel: Tunnels.AddNew;
@@ -1884 +2007 @@
     with AddButton(SBigMetro, nil) do begin
       Enabled := False;
-      FontSize := 60;
-      FontColor := Colors.Text;
+      TextSize := 60;
+      TextColor := Colors.Text;
+      TextDisabledColor := Colors.Text;
       BackgroundColor := clNone;
       BackgroundSelectedColor := clNone;
     end;
     with AddButton(SPlay, MenuItemPlay) do begin
-      FontSize := 40;
-      FontColor := Colors.MenuItemText;
+      TextSize := 40;
+      TextColor := Colors.MenuItemText;
+      TextDisabledColor := Colors.MenuItemDisabledText;
       BackgroundColor := Colors.MenuItemBackground;
       BackgroundSelectedColor := Colors.MenuItemBackgroundSelected;
     end;
-    with AddButton(SOptions, MenuItemOptions) do begin
-      FontSize := 40;
-      FontColor := Colors.MenuItemText;
+    with AddButton(SCareer, MenuItemCareer) do begin
+      TextSize := 40;
+      TextColor := Colors.MenuItemText;
+      TextDisabledColor := Colors.MenuItemDisabledText;
       BackgroundColor := Colors.MenuItemBackground;
       BackgroundSelectedColor := Colors.MenuItemBackgroundSelected;
     end;
-    with AddButton(SExit, MenuItemExit) do begin
-      FontSize := 40;
-      FontColor := Colors.MenuItemText;
+    with AddButton(SOptions, MenuItemOptions) do begin
+      TextSize := 40;
+      TextColor := Colors.MenuItemText;
+      TextDisabledColor := Colors.MenuItemDisabledText;
       BackgroundColor := Colors.MenuItemBackground;
       BackgroundSelectedColor := Colors.MenuItemBackgroundSelected;
     end;
-    OnExit := MenuItemExit;
-  end;
-
-  MenuOptions.Parent := MenuMain;
-  with MenuOptions, Items do begin
-    Clear;
-    with AddComboBox(SLanguage, [], LanguageChanged) do begin
-      FontSize := 40;
-      FontColor := Colors.MenuItemText;
+    with AddButton(SExit, MenuItemExit) do begin
+      TextSize := 40;
+      TextColor := Colors.MenuItemText;
+      TextDisabledColor := Colors.MenuItemDisabledText;
       BackgroundColor := Colors.MenuItemBackground;
       BackgroundSelectedColor := Colors.MenuItemBackgroundSelected;
-      FormMain.Translator1.LanguageListToStrings(States);
-      Index := States.IndexOfObject(FormMain.Translator1.Language);
-      if Index = -1 then Index := 0;
-    end;
-    with AddCheckBox(SDarkMode, DarkModeChanged) do begin
-      FontSize := 40;
-      FontColor := Colors.MenuItemText;
-      BackgroundColor := Colors.MenuItemBackground;
-      BackgroundSelectedColor := Colors.MenuItemBackgroundSelected;
-      Checked := DarkMode;
-    end;
-    with AddCheckBox(SFullScreen, FullScreenChanged) do begin
-      FontSize := 40;
-      FontColor := Colors.MenuItemText;
-      BackgroundColor := Colors.MenuItemBackground;
-      BackgroundSelectedColor := Colors.MenuItemBackgroundSelected;
-      Checked := FormMain.FullScreen;
-    end;
-    with AddButton(SBack, MenuItemBack) do begin
-      FontSize := 40;
-      FontColor := Colors.MenuItemText;
-      BackgroundColor := Colors.MenuItemBackground;
-      BackgroundSelectedColor := Colors.MenuItemBackgroundSelected;
-    end;
-    OnExit := MenuItemBack;
+    end;
+    OnExit := MenuItemExit;
   end;
 
@@ -1948 +2047 @@
     Clear;
     with AddButton(SContinue, MenuItemGameContinue) do begin
-      FontSize := 40;
-      FontColor := Colors.MenuItemText;
+      TextSize := 40;
+      TextColor := Colors.MenuItemText;
+      TextDisabledColor := Colors.MenuItemDisabledText;
       BackgroundColor := Colors.MenuItemBackground;
       BackgroundSelectedColor := Colors.MenuItemBackgroundSelected;
     end;
     with AddButton(SRestart, MenuItemGameRestart) do begin
-      FontSize := 40;
-      FontColor := Colors.MenuItemText;
+      TextSize := 40;
+      TextColor := Colors.MenuItemText;
+      TextDisabledColor := Colors.MenuItemDisabledText;
       BackgroundColor := Colors.MenuItemBackground;
       BackgroundSelectedColor := Colors.MenuItemBackgroundSelected;
     end;
     with AddButton(SExit, MenuItemGameExit) do begin
-      FontSize := 40;
-      FontColor := Colors.MenuItemText;
+      TextSize := 40;
+      TextColor := Colors.MenuItemText;
+      TextDisabledColor := Colors.MenuItemDisabledText;
       BackgroundColor := Colors.MenuItemBackground;
       BackgroundSelectedColor := Colors.MenuItemBackgroundSelected;
@@ -1971 +2073 @@
 procedure TEngine.ButtonBackClick(Sender: TObject);
 begin
-  Menu := MenuGame;
-  LastState := State;
-  State := gsMenu;
-  Redraw;
+  if State = gsSuccess then begin
+    State := gsMenu;
+    MenuItemCareer(Self);
+  end else begin
+    Menu := MenuGame;
+    LastState := State;
+    State := gsMenu;
+    Redraw;
+  end;
 end;
 
@@ -2127 +2234 @@
 begin
   with Canvas do begin
-    DrawFrame(Canvas, Bounds(CanvasSize.X div 8,  ScaleY(90, 96),
+    DrawFrame(Canvas, Bounds(CanvasSize.X div 8, ScaleY(90, 96),
       Round(CanvasSize.X / 4 * 3), ScaleY(210, 96)));
 
@@ -2137 +2244 @@
 
     Font.Size := 40;
-    TextOut((CanvasSize.X - TextWidth(SGameOver)) div 2, Y, SGameOver);
-    Y := Y + Round(TextHeight(SGameOver) * 1.1);
+    Text := SGameOver;
+    TextOut((CanvasSize.X - TextWidth(Text)) div 2, Y, Text);
+    Y := Y + Round(TextHeight(Text) * 1.1);
 
     Font.Size := 14;
-    TextOut((CanvasSize.X - TextWidth(SGameOverReason)) div 2, Y, SGameOverReason);
-    Y := Y + Round(TextHeight(SGameOverReason) * 1.1);
+    Text := SGameOverReason;
+    TextOut((CanvasSize.X - TextWidth(Text)) div 2, Y, Text);
+    Y := Y + Round(TextHeight(Text) * 1.1);
 
     Text := Format(SGameOverStatistic, [ServedPassengerCount, ServedDaysCount]);
@@ -2150 +2259 @@
     Y := Y + ScaleY(16, 96);
 
+    DrawHighScore(Canvas, CanvasSize, Y);
+  end;
+end;
+
+procedure TEngine.DrawHighScore(Canvas: TCanvas; CanvasSize: TPoint; Y: Integer);
+var
+  Text: string;
+begin
+  with Canvas do begin
     // Calculate new highest score
     Text := '';
@@ -2164 +2282 @@
     if (ServedDaysCount > HighestServedDaysCount) then
       HighestServedDaysCount := ServedDaysCount;
+
+    if Assigned(City) then begin
+      if (ServedPassengerCount > City.HighestServedPassengerCount) then
+        City.HighestServedPassengerCount := ServedPassengerCount;
+      if (ServedDaysCount > City.HighestServedDaysCount) then
+        City.HighestServedDaysCount := ServedDaysCount;
+    end;
+  end;
+end;
+
+procedure TEngine.DrawSuccess(Canvas: TCanvas; CanvasSize: TPoint);
+var
+  Y: Integer;
+  Text: string;
+  Index: Integer;
+begin
+  with Canvas do begin
+    DrawFrame(Canvas, Bounds(CanvasSize.X div 8, ScaleY(90, 96),
+      Round(CanvasSize.X / 4 * 3), ScaleY(230, 96)));
+
+    Canvas.Font.Color := Self.Colors.Text;
+    Brush.Style := bsClear;
+    Pen.Style := psClear;
+
+    Y := ScaleY(100, 96);
+
+    Font.Size := 40;
+    Text := SSuccess;
+    TextOut((CanvasSize.X - TextWidth(Text)) div 2, Y, Text);
+    Y := Y + Round(TextHeight(Text) * 1.1);
+
+    Font.Size := 14;
+    Text := SSuccessReason;
+    TextOut((CanvasSize.X - TextWidth(Text)) div 2, Y, Text);
+    Y := Y + Round(TextHeight(Text) * 1.1);
+
+    // Unlock next city
+    if Assigned(City) then begin
+      Index := Cities.IndexOf(City);
+      if (Index >= 0) and ((Index + 1) < Cities.Count) then begin
+        Cities[Index + 1].Locked := False;
+        Font.Size := 14;
+        Text := Format(SUnlockedCity, [Cities[Index + 1].Name]);
+        TextOut((CanvasSize.X - TextWidth(Text)) div 2, Y, Text);
+        Y := Y + Round(TextHeight(Text) * 1.1);
+      end;
+    end;
+
+    Text := Format(SGameOverStatistic, [ServedPassengerCount, ServedDaysCount]);
+    TextOut((CanvasSize.X - TextWidth(Text)) div 2, Y, Text);
+    Y := Y + Round(TextHeight(SGameOverStatistic) * 1.1);
+
+    Y := Y + ScaleY(16, 96);
+
+    DrawHighScore(Canvas, CanvasSize, Y);
   end;
 end;
@@ -2499 +2672 @@
 
   // Passenger count
-  X := CanvasSize.X - ScaleX(30, 96);
-  Text := IntToStr(ServedPassengerCount);
-  ImagePassenger.Bounds := Bounds(X - Canvas.TextWidth(Text), Y - IconSize div 2,
+  X := CanvasSize.X - ScaleX(10, 96);
+  ImagePassenger.Bounds := Bounds(X - IconSize, Y - IconSize div 2,
     IconSize, IconSize);
   ImagePassenger.Canvas := Canvas;
   ImagePassenger.Paint;
-  X := X - Canvas.TextWidth(Text) - SeparatorSize div 3;
+  X := X - IconSize - SeparatorSize div 3;
 
   Canvas.Brush.Style := bsClear;
   Canvas.Font.Size := 14;
   Canvas.Font.Color := Colors.Text;
+  Text := IntToStr(ServedPassengerCount);
   Canvas.TextOut(X - Canvas.TextWidth(Text),
     Y - Canvas.TextHeight(Text) div 2, Text);
@@ -2522 +2695 @@
   ButtonBack.Bounds.Top := 10;
   ButtonBack.Paint;
+
+  // City name
+  if Assigned(City) then begin
+    Canvas.Brush.Style := bsClear;
+    Canvas.Font.Color := Colors.Text;
+    Canvas.Font.Size := 20;
+    Text := City.Name;
+    Canvas.TextOut(20, CanvasSize.Y -
+      Canvas.TextHeight(Text) - 20, Text);
+
+    X := CanvasSize.X - ScaleX(10, 96);
+    ImageAchievement.Bounds := Bounds(X - IconSize, Y - 2 * IconSize,
+      IconSize, IconSize);
+    ImageAchievement.Canvas := Canvas;
+    ImageAchievement.Paint;
+
+    X := X - IconSize - SeparatorSize div 3;
+
+    Canvas.Brush.Style := bsClear;
+    Canvas.Font.Size := 14;
+    Canvas.Font.Color := Colors.Text;
+    Text := IntToStr(City.PassengersCountToUnlock);
+    Canvas.TextOut(X - Canvas.TextWidth(Text),
+      Y - Round(1.5 * IconSize) - Canvas.TextHeight(Text) div 2, Text);
+  end;
 
   // Show train grabbed by mouse
@@ -2633 +2831 @@
         Redraw;
       end;
+    end;
+
+    if Assigned(City) and (ServedPassengerCount >= City.PassengersCountToUnlock) then begin
+      State := gsSuccess;
+      Redraw;
     end;
   end;
@@ -2711 +2914 @@
       Redraw;
     end else
-    if State = gsGameOver then begin
+    if State in [gsGameOver, gsSuccess] then begin
       ButtonBack.MouseUp(Position);
     end else
@@ -2890 +3093 @@
   KeyF5 = 116;
   KeyF6 = 117;
+  KeyF7 = 118;
+  KeyT = 84;
+  KeyC = 67;
+  KeyF = 70;
+  KeyP = 80;
 begin
   if Key = KeyEsc then begin
@@ -2899 +3107 @@
     end;
   end;
+  if State in [gsRunning, gsPaused] then begin
+    if Key = KeyT then begin
+      if Trains.GetUnusedCount > 0 then begin
+        SelectedTrain := Trains.GetUnused;
+        Redraw;
+      end;
+    end else
+    if Key = KeyC then begin
+      if Carriages.GetUnusedCount > 0 then begin
+        SelectedCarriage := Carriages.GetUnused;
+        Redraw;
+      end;
+    end else
+    if Key = KeyF then begin
+      ButtonFastForward(Self);
+    end else
+    if Key = KeyP then begin
+      ButtonPlay(Self);
+    end;
+  end;
   {$IFDEF DEBUG}
   if State in [gsRunning, gsPaused] then begin
@@ -2921 +3149 @@
       ResizeView;
       Redraw;
+    end else
+    if Key = KeyF7 then begin
+      State := gsSuccess;
+      Redraw;
     end;
   end;
@@ -2934 +3166 @@
 procedure TEngine.Clear;
 begin
+  ServedPassengerCount := 0;
   Week := 1;
   Trains.Clear;
@@ -2948 +3181 @@
   NewStation: TMapStation;
   InitialStationCount: Integer;
+  InitialLineCount: Integer;
 begin
   Clear;
+  if Assigned(City) then begin
+    LineColors := City.LineColors;
+    InitialLineCount := City.InitialLineCount;
+  end else begin
+    LineColors := [clBlue, clRed, clDarkYellow, clGreen,
+       clPurple, clGray, clOrange, clBrown, clCyan];
+    InitialLineCount := 3;
+  end;
   AvailableImprovements := [miCarriage, miLine];
   ShapeCount := 3;
-  ServedPassengerCount := 0;
 
   // Start with 3 stations with each different shape
@@ -2963 +3204 @@
   end;
 
-  for I := 0 to 2 do begin
-    Lines.AddNew;
+  for I := 0 to InitialLineCount - 1 do begin
+    Lines.AddNew(LineColors[Lines.Count]);
     NewTrain := TMetroTrain.Create;
     Trains.Add(NewTrain);
@@ -2988 +3229 @@
 end;
 
-procedure TEngine.LoadFromRegistry(Context: TRegistryContext);
+procedure TEngine.LoadFromRegistry;
 begin
   with TRegistryEx.Create do
   try
-    CurrentContext := Context;
+    CurrentContext := RegistryContext;
     DarkMode := ReadBoolWithDefault('DarkMode', False);
     HighestServedPassengerCount := ReadIntegerWithDefault('HighestPassengers', 0);
     HighestServedDaysCount := ReadIntegerWithDefault('HighestDays', 0);
+    Cities.LoadFromRegistry(TRegistryContext.Create(RegistryContext.RootKey, RegistryContext.Key + '/Cities'));
   finally
     Free;
@@ -3001 +3243 @@
 end;
 
-procedure TEngine.SaveToRegistry(Context: TRegistryContext);
+procedure TEngine.SaveToRegistry;
 begin
   with TRegistryEx.Create do
   try
-    CurrentContext := Context;
+    CurrentContext := RegistryContext;
 
     WriteBool('DarkMode', DarkMode);
     WriteInteger('HighestPassengers', HighestServedPassengerCount);
     WriteInteger('HighestDays', HighestServedDaysCount);
+    Cities.SaveToRegistry(TRegistryContext.Create(RegistryContext.RootKey, RegistryContext.Key + '/Cities'));
   finally
     Free;
@@ -3023 +3266 @@
   ButtonBack.OnClick := ButtonBackClick;
   ButtonBack.Bounds := Bounds(0, 0, ScaleX(80, 96), ScaleY(80, 96));
+  Cities := TCities.Create;
+  InitCities;
   MenuMain := TMenu.Create;
   MenuOptions := TMenu.Create;
+  MenuCareer := TMenu.Create;
   MenuGame := TMenu.Create;
   Menu := MenuMain;
@@ -3049 +3295 @@
   ImageFastForward := TImage.Create;
   ImageFastForward.OnClick := ButtonFastForward;
+  ImageAchievement := TImage.Create;
   ImageNewTrain := TImage.Create;
   ImageNewTrain.OnClick := ButtonNewTrain;
@@ -3056 +3303 @@
   ImageNewImprovement2.OnClick := ButtonNewImprovement2;
   MetaCanvas := TMetaCanvas.Create;
-  Cities := TCities.Create;
-  InitCities;
   Colors.Init(FDarkMode);
 end;
@@ -3063 +3308 @@
 destructor TEngine.Destroy;
 begin
-  FreeAndNil(Cities);
   FreeAndNil(MetaCanvas);
   FreeAndNil(Trains);
@@ -3075 +3319 @@
   FreeAndNil(ImagePlay);
   FreeAndNil(ImageFastForward);
+  FreeAndNil(ImageAchievement);
   FreeAndNil(ImagePause);
   FreeAndNil(ImageCarriage);
@@ -3086 +3331 @@
   FreeAndNil(MenuMain);
   FreeAndNil(MenuOptions);
+  FreeAndNil(MenuCareer);
   FreeAndNil(MenuGame);
+  FreeAndNil(Cities);
   FreeAndNil(ButtonBack);
   inherited;
@@ -3112 +3359 @@
   MetaCanvas.DrawTo(Canvas);
 
-  // Game over
   if State = gsGameOver then
   begin
     DrawGameOver(Canvas, CanvasSize);
+    DrawGameControls(Canvas, CanvasSize);
+  end else
+  if State = gsSuccess then
+  begin
+    DrawSuccess(Canvas, CanvasSize);
     DrawGameControls(Canvas, CanvasSize);
   end else