Changeset 66

Timestamp:

Nov 26, 2020, 11:00:03 PM (3 years ago)

Author:

chronos

Message:

• Added: Show highes score on game over.
• Fixed: Applied dark mode colors to stations.

Location:

trunk

Files:

• Forms/UFormMain.pas (modified) (2 diffs)
• Languages/BigMetro.cs.po (modified) (2 diffs)
• Languages/BigMetro.po (modified) (2 diffs)
• UEngine.pas (modified) (16 diffs)

trunk/Forms/UFormMain.pas

@@ -189 +189 @@
     end else Translator1.Language := Translator1.Languages.SearchByCode('');
     Engine.DarkMode := ReadBoolWithDefault('DarkMode', False);
+    Engine.HighestServedPassengerCount := ReadIntegerWithDefault('HighestPassengers', 0);
+    Engine.HighestServedDaysCount := ReadIntegerWithDefault('HighestDays', 0);
   finally
     Free;
@@ -204 +206 @@
       else DeleteValue('LanguageCode');
     WriteBool('DarkMode', Engine.DarkMode);
+    WriteInteger('HighestPassengers', Engine.HighestServedPassengerCount);
+    WriteInteger('HighestDays', Engine.HighestServedDaysCount);
   finally
     Free;

trunk/Languages/BigMetro.cs.po

@@ -25 +25 @@
 msgstr "Pokus o rozpojení již připojeného bodu trasy"
 
+#: uengine.sday
+msgid "Day"
+msgstr "Den"
+
 #: uengine.sgameover
 msgid "Game Over"
@@ -36 +40 @@
 msgid "%d passengers travelled on your metro over %d days."
 msgstr "%d cestujících cestovalo ve vašem metru během %d dnů."
+
+#: uengine.snewhighscore
+msgid "New high score!"
+msgstr "Nové vysoké skóre!"
+
+#: uengine.soldhighscore
+msgid "Old high score was %d passengers in %d days."
+msgstr "Dřívější vysoké skóre bylo %d cestujících v %d dnech."
 
 #: uengine.szerozoomnotalowed

trunk/Languages/BigMetro.po

@@ -15 +15 @@
 msgstr ""
 
+#: uengine.sday
+msgid "Day"
+msgstr ""
+
 #: uengine.sgameover
 msgid "Game Over"
@@ -25 +29 @@
 #: uengine.sgameoverstatistic
 msgid "%d passengers travelled on your metro over %d days."
+msgstr ""
+
+#: uengine.snewhighscore
+msgid "New high score!"
+msgstr ""
+
+#: uengine.soldhighscore
+msgid "Old high score was %d passengers in %d days."
 msgstr ""
 

trunk/UEngine.pas

@@ -2 +2 @@
 
 {$mode delphi}
+{$IFDEF DARWIN}{$modeswitch Objectivec1}{$ENDIF}
 
 interface
 
 uses
+  {$IFDEF Darwin}MacOSAll, CocoaAll, CocoaUtils,{$ENDIF}
   Classes, SysUtils, Graphics, Controls, ExtCtrls, Math, DateUtils,
   UMetaCanvas, fgl, UMenu;
@@ -28 +30 @@
     Background: TColor;
     Text: TColor;
+    ShapeBackground: TColor;
     MenuItemText: TColor;
     MenuItemBackground: TColor;
@@ -290 +293 @@
     MenuGame: TMenu;
     ButtonBack: TMenuItemButton;
+    function GetServedDaysCount: Integer;
     procedure ResizeView;
     function GetExistStationShapes: TStationShapeSet;
@@ -338 +342 @@
     ImagePassenger: TImage;
     ImageLocomotive: TImage;
+    HighestServedPassengerCount: Integer;
+    HighestServedDaysCount: Integer;
     procedure InitMenus;
     procedure MouseMove(Position: TPoint);
@@ -353 +359 @@
     property Time: TDateTime read FTime;
     property DarkMode: Boolean read FDarkMode write SetDarkMode;
+    property ServedDaysCount: Integer read GetServedDaysCount;
   end;
 
@@ -400 +407 @@
   SGameOverReason = 'Overcrowding at this station has forced you to resign as metro manager.';
   SGameOverStatistic = '%d passengers travelled on your metro over %d days.';
+  SDay = 'Day';
+  SNewHighScore = 'New high score!';
+  SOldHighScore = 'Old high score was %d passengers in %d days.';
 
 { TTrackLinks }
@@ -1356 +1366 @@
   View.SourceRect := Bounds(NewPoint.X, NewPoint.Y, Trunc((View.DestRect.Right - View.DestRect.Left) / View.Zoom),
     Trunc((View.DestRect.Bottom - View.DestRect.Top) / View.Zoom));
+end;
+
+function TEngine.GetServedDaysCount: Integer;
+begin
+  Result := Trunc(Time);
 end;
 
@@ -1655 +1670 @@
     Background := $2f3020;
     Text := clWhite;
+    ShapeBackground := clBlack;
     MenuItemText := $cccccc;
     MenuItemBackground := $b75C01;
@@ -1661 +1677 @@
     Background := $eff0e0;
     Text := clBlack;
+    ShapeBackground := clWhite;
     MenuItemText := clWhite;
     MenuItemBackground := $e78C31;
@@ -2067 +2084 @@
   Angle: Double;
   Text: string;
+  Text2: string;
   I: Integer;
 const
@@ -2079 +2097 @@
   Canvas.Line(ClockCenter, Point(ClockCenter.X + Round(Cos(Angle) * ClockSize * 0.8),
     ClockCenter.Y + Round(Sin(Angle) * ClockSize * 0.8)));
-  Text := FormatDateTime('ddd', Time);
-  Canvas.TextOut(ClockCenter.X - ClockSize - Canvas.TextWidth(Text) - 5, ClockCenter.Y -
-    Canvas.TextWidth(Text) div 2, Text);
   for I := 0 to 12 do begin
     Angle := I / 12 * 2 * Pi;
@@ -2089 +2104 @@
       ClockCenter.Y + Round(Sin(Angle) * ClockSize * 0.9));
   end;
+
+  Canvas.Font.Color := Colors.Text;
+  Text := FormatDateTime('ddd', Time + 2);
+  Canvas.TextOut(ClockCenter.X - ClockSize - Canvas.TextWidth(Text) - 10, ClockCenter.Y -
+    Canvas.TextHeight(Text) div 2, Text);
+
+  Text2 := SDay + ' ' + IntToStr(Trunc(Time));
+  Canvas.TextOut(ClockCenter.X - ClockSize - Canvas.TextWidth(Text) - 10, ClockCenter.Y -
+    Canvas.TextHeight(Text2) div 2 + Trunc(Canvas.TextHeight(Text) * 1.1), Text2);
 end;
 
@@ -2140 +2164 @@
     Font.Size := 40;
     TextOut((Width - TextWidth(SGameOver)) div 2, Y, SGameOver);
-
     Y := Y + Round(TextHeight(SGameOver) * 1.1);
+
     Font.Size := 14;
     TextOut((Width - TextWidth(SGameOverReason)) div 2, Y, SGameOverReason);
-
     Y := Y + Round(TextHeight(SGameOverReason) * 1.1);
-    Text := Format(SGameOverStatistic, [ServedPassengerCount, Trunc(Time)]);
+
+    Text := Format(SGameOverStatistic, [ServedPassengerCount, ServedDaysCount]);
     TextOut((Width - TextWidth(Text)) div 2, Y, Text);
+    Y := Y + Round(TextHeight(SGameOverStatistic) * 1.1);
+
+    Y := Y + 16;
+
+    // Calculate new highest score
+    Text := '';
+    if (ServedPassengerCount > HighestServedPassengerCount) or
+      (ServedDaysCount > HighestServedDaysCount) then begin
+      Text := SNewHighScore + ' ';
+    end;
+    Text := Text + Format(SOldHighScore, [HighestServedPassengerCount,
+      HighestServedDaysCount]);
+    Canvas.TextOut((Canvas.Width - Canvas.TextWidth(Text)) div 2, Y, Text);
+    Y := Y + Round(TextHeight(Text) * 1.1);
+    if (ServedPassengerCount > HighestServedPassengerCount) then
+      HighestServedPassengerCount := ServedPassengerCount;
+    if (ServedDaysCount > HighestServedDaysCount) then
+      HighestServedDaysCount := ServedDaysCount;
   end;
 end;
@@ -2429 +2471 @@
 const
   KeyEsc = 27;
+  KeyF2 = 113;
 begin
   if Key = KeyEsc then begin
@@ -2438 +2481 @@
     end;
   end;
+  {$IFDEF DEBUG}
+  if Key = KeyF2 then begin
+    State := gsGameOver;
+    Redraw;
+  end;
+  {$ENDIF}
 end;
 
@@ -2669 +2718 @@
     end;
 
-    Canvas.Brush.Color := clWhite;
+    Canvas.Brush.Color := Colors.ShapeBackground;
     Canvas.Brush.Style := bsSolid;
-    Canvas.Pen.Color := clBlack;
+    Canvas.Pen.Color := Colors.Text;
     DrawShape(Canvas, Position, Shape, StationSize, 0);
 
     // Draw passengers
     Canvas.Pen.Style := psClear;
-    Canvas.Brush.Color := clBlack;
+    Canvas.Brush.Color := Colors.Text;
     PassengerPos := Point(0, 0);
     Direction := 1;