Changeset 87

Timestamp:

May 17, 2024, 8:50:43 PM (7 months ago)

Author:

chronos

Message:

• Fixed: Show stats for more than 4 player in two parts second bellow first part.
• Fixed: Translate player names.
• Fixed: Player view size calculation for 5 players.
• Modified: Use same default keys as in the original game.

Location:

trunk

Files:

• Engine.pas (modified) (12 diffs)
• Forms/FormMain.pas (modified) (1 diff)
• Languages/Tunneler.cs.po (modified) (1 diff)
• Languages/Tunneler.pot (modified) (1 diff)
• UITypes2.pas (modified) (2 diffs)

trunk/Engine.pas

@@ -205 +205 @@
     gsInstructions, gsSettings, gsPlayerKeys, gsPlayerKeysRedefine);
 
+  TPlayerColor = (pcGreen);
+
   { TEngine }
 
@@ -231 +233 @@
     procedure ClearBackground;
     procedure DrawMenu;
+    procedure DrawStatsPartial(PlayerIndex, YDiff: Integer);
     procedure DrawStats;
     procedure DrawGamePrepare(Thread: TVirtualThread);
@@ -273 +276 @@
     procedure SaveToRegistry(Context: TRegistryContext);
     procedure InitPlayerPool;
+    procedure Translate;
     property Bitmap: TBitmap read FBitmap write SetBitmap;
     property Active: Boolean read FActive write SetActive;
@@ -308 +312 @@
     'Players can refuel at either base but can repair their shields only at their own bases.';
   SInstructionsDetails4 = 'Controls: \n ' +
-    'Blue: W - up, A - left, S - down, D - right, E - shoot \n ' +
-    'Green: arrows key, CTRL - shoot';
+    'Blue: W - up, A - left, X - down, D - right, Control - shoot \n ' +
+    'Green: arrows key, Enter - shoot';
   SInformation = 'Information';
   SInformationDetails = 'Tunneler is written from scratch in Lazarus/FPC. ' +
@@ -1707 +1711 @@
     Name := SGreen;
     Keys.Left := vkA;
-    Keys.Down := vkS;
+    Keys.Down := vkX;
     Keys.Right := vkD;
     Keys.Up := vkW;
-    Keys.Shoot := vkE;
+    Keys.Shoot := vkControl;
     Color1 := $00ff00;
     Color2 := $00a000;
@@ -1721 +1725 @@
     Keys.Right := vkRight;
     Keys.Up := vkUp;
-    Keys.Shoot := vkControl;
+    Keys.Shoot := vkReturn;
     Color1 := $ff2c2c;
     Color2 := $b60000;
@@ -1793 +1797 @@
     if I < 2 then Enabled := True;
   end;
+end;
+
+procedure TEngine.Translate;
+begin
+  PlayerPool[0].Name := SGreen;
+  PlayerPool[1].Name := SBlue;
+  PlayerPool[2].Name := SRed;
+  PlayerPool[3].Name := SPink;
+  PlayerPool[4].Name := SCyan;
+  PlayerPool[5].Name := SYellow;
+  PlayerPool[6].Name := SOrange;
+  PlayerPool[7].Name := SGray;
 end;
 
@@ -1893 +1909 @@
 end;
 
-procedure TEngine.DrawStats;
+procedure TEngine.DrawStatsPartial(PlayerIndex, YDiff: Integer);
 var
   X: Integer;
   Y: Integer;
+  I: Integer;
   Text: string;
-  Winner: TPlayer;
-  I: Integer;
   ShotsPercent: Integer;
 const
@@ -1905 +1920 @@
 begin
   with Bitmap.Canvas do begin
-    X := Bitmap.Width div 4 * 3;
-
-    Brush.Style := bsClear;
-    Pen.Style := psSolid;
-
-    Pen.Color := clWhite;
-    MoveTo(Bitmap.Width div 2, 0);
-    LineTo(Bitmap.Width div 2, Bitmap.Height);
-
-    Font.Color := clCyan;
-    Font.Size := 20;
-    Text := SStatistics;
-    TextOut(X - TextWidth(Text) div 2, Bitmap.Height div 10, Text);
-
     Font.Color := clOrange;
     Font.Size := 20;
 
-    Y := Bitmap.Height div 10 + 3 * LineHeight;
+    Y := Bitmap.Height div 10 + 3 * LineHeight + YDiff;
     X := Bitmap.Width div 2 + 50;
     Inc(Y, LineHeight);
@@ -1942 +1943 @@
     Inc(Y, LineHeight);
 
-    for I := 0 to Players.Count - 1 do
+    for I := PlayerIndex to Min(Players.Count - 1, PlayerIndex + 3) do
+    if I < Players.Count then
     with Players[I] do begin
-      Y := Bitmap.Height div 10 + 3 * LineHeight;
-      X := Bitmap.Width div 2 + 50 + 500 + 200 * I;
+      Y := Bitmap.Height div 10 + 3 * LineHeight + YDiff;
+      X := Bitmap.Width div 2 + 50 + 500 + 200 * (I - PlayerIndex);
       Font.Color := Color1;
       Text := Name;
@@ -1972 +1974 @@
 
     Inc(Y, 3 * LineHeight);
+  end;
+end;
+
+procedure TEngine.DrawStats;
+var
+  X: Integer;
+  Y: Integer;
+  Text: string;
+  Winner: TPlayer;
+begin
+  with Bitmap.Canvas do begin
+    X := Bitmap.Width div 4 * 3;
+
+    Brush.Style := bsClear;
+    Pen.Style := psSolid;
+
+    Pen.Color := clWhite;
+    MoveTo(Bitmap.Width div 2, 0);
+    LineTo(Bitmap.Width div 2, Bitmap.Height);
+
+    Font.Color := clCyan;
+    Font.Size := 20;
+    Text := SStatistics;
+    TextOut(X - TextWidth(Text) div 2, Bitmap.Height div 10, Text);
+
+    DrawStatsPartial(0, 0);
+    if Players.Count > 4 then
+      DrawStatsPartial(4, 400);
 
     X := Bitmap.Width div 2 + 50;
@@ -2019 +2049 @@
       if Players.Count > 2 then VertFrameCount := 2
         else VertFrameCount := 1;
-      HorizFrameCount := Round(Players.Count / VertFrameCount);
+      HorizFrameCount := Ceil(Players.Count / VertFrameCount);
     end else begin
       VertFrameCount := 1;

trunk/Forms/FormMain.pas

@@ -187 +187 @@
   Engine.HomePage := Core.Core.ApplicationInfo.HomePage;
   LoadConfig;
+  Engine.Translate;
   Engine.Bitmap := Image1.Picture.Bitmap;
   Engine.NewGame;

trunk/Languages/Tunneler.cs.po

@@ -91 +91 @@
 #: engine.sinstructionsdetails4
 msgctxt "engine.sinstructionsdetails4"
-msgid "Controls: \\n Blue: W - up, A - left, S - down, D - right, E - shoot \\n Green: arrows key, CTRL - shoot"
-msgstr "Ovládání: \\n Modrá: W - nahoru, A - vlevo, S - dolů, D - vpravo, E - střelba \\n ZelenÃœ: kurzorové Å¡ipky, CTRL + střelba"
+msgid "Controls: \\n Blue: W - up, A - left, X - down, D - right, Control - shoot \\n Green: arrows key, Enter - shoot"
+msgstr "Ovládání: \\n Modrá: W - nahoru, A - vlevo, X - dolů, D - vpravo, Control - střelba \\n ZelenÃœ: kurzorové Å¡ipky, Return + střelba"
 
 #: engine.sleft

trunk/Languages/Tunneler.pot

@@ -81 +81 @@
 #: engine.sinstructionsdetails4
 msgctxt "engine.sinstructionsdetails4"
-msgid "Controls: \\n Blue: W - up, A - left, S - down, D - right, E - shoot \\n Green: arrows key, CTRL - shoot"
+msgid "Controls: \\n Blue: W - up, A - left, X - down, D - right, Control - shoot \\n Green: arrows key, Enter - shoot"
 msgstr ""
 

trunk/UITypes2.pas

@@ -17 +17 @@
   vkS: Integer = $53;
   vkW: Integer = $57;
+  vkX: Integer = $58;
   vkLeft: Integer = $25;
   vkRight: Integer = $27;
@@ -24 +25 @@
   vkQuote: Integer = $DE;
   vkSlash: Integer = $BF;
+  vkReturn: Integer = $D;
   vkNumpad1: Integer = $61;
   vkNumpad2: Integer = $62;