Changeset 67 for trunk

Timestamp:

Jan 8, 2023, 12:29:51 AM (2 years ago)

Author:

chronos

Message:

• Fixed: Speed of shield hit and refresh.
• Fixed: Game statistics. Track meters dug, meters travelled, shots count and shots hit.
• Fixed: Cleanup bullets before new round.

Location:

trunk

Files:

• Forms/UFormMain.pas (modified) (1 diff)
• Languages/Tunneler.cs.po (modified) (3 diffs)
• Languages/Tunneler.pot (modified) (2 diffs)
• UEngine.pas (modified) (18 diffs)

trunk/Forms/UFormMain.pas

@@ -4 +4 @@
 
 uses
-  XMLConf, Classes, SysUtils, FileUtil, Forms, Controls, Graphics,
+  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, LCLType,
   Dialogs, ExtCtrls, ComCtrls, Menus, ActnList, UEngine, UPlatform, Math,
   DateUtils, GraphType, UPersistentForm, UApplicationInfo, UTranslator,
-  LCLType, URegistry, UAboutDialog, DOM;
+  URegistry, UAboutDialog;
 
 type

trunk/Languages/Tunneler.cs.po

@@ -190 +190 @@
 msgstr "Instrukce"
 
+#: uengine.smetersdug
+msgid "Meters dug"
+msgstr ""
+
+#: uengine.smeterstravelled
+msgid "Meters travelled"
+msgstr ""
+
 #: uengine.sorange
 msgid "Orange"
 msgstr "Oranşová"
+
+#: uengine.spercenthit
+msgid "Percent hit"
+msgstr ""
 
 #: uengine.spink
@@ -218 +230 @@
 msgid "Shot fired"
 msgstr "Střel vystřeleno"
+
+#: uengine.sshotshit
+msgid "Shot hit"
+msgstr ""
 
 #: uengine.sstartgame
@@ -244 +260 @@
 msgid "%0:s of %1:s"
 msgstr "%0:s z %1:s"
+

trunk/Languages/Tunneler.pot

@@ -154 +154 @@
 msgstr ""
 
+#: uengine.smetersdug
+msgid "Meters dug"
+msgstr ""
+
+#: uengine.smeterstravelled
+msgid "Meters travelled"
+msgstr ""
+
 #: uengine.sorange
 msgid "Orange"
 msgstr ""
 
+#: uengine.spercenthit
+msgid "Percent hit"
+msgstr ""
+
 #: uengine.spink
 msgid "Pink"
@@ -180 +192 @@
 #: uengine.sshotsfired
 msgid "Shot fired"
+msgstr ""
+
+#: uengine.sshotshit
+msgid "Shot hit"
 msgstr ""
 

trunk/UEngine.pas

@@ -16 +16 @@
   EnergyDecreaseOutside = 0.00003; // ~5 minutes of live
   EnergyIncreaseHome = 0.001;
-  ShieldSteps = 40;
+  ShieldIncreaseHome = 0.001;
+  ShieldDecreaseHit = 0.15;
   ExplosionBulletCount = 100;
   ExplosionRange = 20;
@@ -60 +61 @@
     Player: TPlayer;
     Position: TRealPoint;
+    PositionTail: TRealPoint;
     Direction: TRealPoint;
     MaxDistance: Integer;
     Distance: Real;
     StopByDirt: Boolean;
+    CanKill: Boolean;
     constructor Create;
   end;
 
+  { TBullets }
+
   TBullets = class(TObjectList<TBullet>)
+    procedure HideAll;
   end;
 
@@ -129 +135 @@
     LastShield: Real;
     House: TRectangle;
-    ShootCount: Integer;
+    ShotsCount: Integer;
+    ShotsHit: Integer;
+    MetersDug: Integer;
+    MetersTravelled: Integer;
     procedure ResetTank;
     procedure Init;
@@ -277 +286 @@
   SStatistics = 'Statistics';
   SShotsFired = 'Shot fired';
+  SShotsHit = 'Shot hit';
+  SPercentHit = 'Percent hit';
+  SMetersDug = 'Meters dug';
+  SMetersTravelled = 'Meters travelled';
   SWinnerIs = 'The winner is';
   SGreen = 'Green';
@@ -287 +300 @@
   SGray = 'Gray';
 
+{ TBullets }
+
+procedure TBullets.HideAll;
+var
+  I: Integer;
+begin
+  for I := 0 to Count - 1 do
+  with Items[I] do begin
+    Player.Engine.World.Surface.ItemsXY[Trunc(Position.X), Trunc(Position.Y)] := Byte(miSpace);
+    Player.Engine.World.Surface.ItemsXY[Trunc(PositionTail.X), Trunc(PositionTail.Y)] := Byte(miSpace);
+  end;
+end;
+
 { TTanks }
 
@@ -424 +450 @@
   MaxDistance := -1;
   Distance := 0;
+  CanKill := True;
 end;
 
@@ -491 +518 @@
     if (Bullets.Count < MaxBulletCount) and
     ((Now - LastShootTime) > ShootDelay * OneSecond) then begin
-      Inc(ShootCount);
+      Inc(ShotsCount);
       NewBullet := TBullet.Create;
       NewBullet.Player := Self;
@@ -537 +564 @@
         Direction := NewDirection;
         Result := True;
+        Inc(MetersDug);
       end;
     end else begin
@@ -546 +574 @@
         LastMoveTime := Now;
         Energy := Energy - EnergyDecreaseMove;
+        Inc(MetersTravelled);
       end;
     end;
@@ -588 +617 @@
   if House.IsInside(Position) then begin
     if not Exploded then
-      Shield := Shield + 0.2 * 1 / ShieldSteps;
+      Shield := Shield + ShieldIncreaseHome;
     if Shield > 1 then Shield := 1;
   end;
@@ -612 +641 @@
     P := Trunc(Direction.Y);
 
+    PositionTail := Position;
     Position.X := Position.X + Direction.X;
     Position.Y := Position.Y + Direction.Y;
@@ -641 +671 @@
           if (Self.Id <> P) and
             (Engine.World.Matters[ItemsXY[Pos.X, Pos.Y]].Kind = mkTankBody) and
-            (Engine.World.Matters[ItemsXY[Pos.X, Pos.Y]].Player = P) then
-            Shield := Shield - 1 / ShieldSteps;
+            (Engine.World.Matters[ItemsXY[Pos.X, Pos.Y]].Player = P) and CanKill then begin
+              Shield := Shield - ShieldDecreaseHit;
+              Inc(Self.ShotsHit);
+            end;
           if StopByDirt then Explosion(LastPos, BulletExplosionRange);
           Bullets.Delete(I);
@@ -788 +820 @@
   Position := StartPosition;
   ExplosionPending := False;
+  Bullets.HideAll;
   Bullets.Clear;
   Energy := 1;
   Shield := 1;
   Direction := 0;
-  ShootCount := 0;
   ShowTank;
   Exploded := False;
@@ -804 +836 @@
   Position := StartPosition;
   PlaceHouse;
+  ShotsCount := 0;
+  ShotsHit := 0;
+  MetersDug := 0;
+  MetersTravelled := 0;
 end;
 
@@ -824 +860 @@
       NewBullet.Position.Y := Position.Y; // + NewBullet.Direction.Y * 3;
       NewBullet.MaxDistance := Random(Distance);
+      NewBullet.CanKill := False;
       Bullets.Add(NewBullet);
     end;
@@ -958 +995 @@
   StartPosition := Source.StartPosition;
   Score := Source.Score;
-  ShootCount := Source.ShootCount;
+  ShotsCount := Source.ShotsCount;
+  ShotsHit := Source.ShotsHit;
+  MetersDug := Source.MetersDug;
+  MetersTravelled := Source.MetersTravelled;
   FExploded := Source.FExploded;
   Tanks.Assign(Source.Tanks);
@@ -1535 +1575 @@
 var
   X: Integer;
+  Y: Integer;
   Text: string;
   Winner: TPlayer;
+  I: Integer;
+  ShotsPercent: Integer;
+const
+  LineHeight = 40;
 begin
   with Bitmap.Canvas do begin
@@ -1556 +1601 @@
     Font.Size := 20;
 
-    //Text := SShotsFired + ' ' + IntToStr(ShootCount);
-    //TextOut(X - TextWidth(Text) div 2, Bitmap.Height div 10, Text);
-
+    Y := Bitmap.Height div 10 + 3 * LineHeight;
+    X := Bitmap.Width div 2 + 50;
+    Inc(Y, LineHeight);
+    Text := SShotsFired;
+    TextOut(X, Y, Text);
+    Inc(Y, LineHeight);
+    Text := SShotsHit;
+    TextOut(X, Y, Text);
+    Inc(Y, LineHeight);
+    Text := SPercentHit;
+    TextOut(X, Y, Text);
+    Inc(Y, LineHeight);
+    Inc(Y, LineHeight);
+    Text := SMetersDug;
+    TextOut(X, Y, Text);
+    Inc(Y, LineHeight);
+    Text := SMetersTravelled;
+    TextOut(X, Y, Text);
+    Inc(Y, LineHeight);
+
+    for I := 0 to Players.Count - 1 do
+    with Players[I] do begin
+      Y := Bitmap.Height div 10 + 3 * LineHeight;
+      X := Bitmap.Width div 2 + 50 + 500 + 200 * I;
+      Font.Color := Color1;
+      Text := Name;
+      TextOut(X - TextWidth(Text) , Y, Text);
+      Inc(Y, LineHeight);
+      Text := IntToStr(ShotsCount);
+      TextOut(X - TextWidth(Text), Y, Text);
+      Inc(Y, LineHeight);
+      Text := IntToStr(ShotsHit);
+      TextOut(X - TextWidth(Text), Y, Text);
+      Inc(Y, LineHeight);
+      if ShotsCount > 0 then
+        ShotsPercent := Round(ShotsHit / ShotsCount * 100)
+        else ShotsPercent := 0;
+      Text := IntToStr(ShotsPercent) + '%';
+      TextOut(X - TextWidth(Text), Y, Text);
+      Inc(Y, LineHeight);
+      Inc(Y, LineHeight);
+      Text := IntToStr(MetersDug);
+      TextOut(X - TextWidth(Text), Y, Text);
+      Inc(Y, LineHeight);
+      Text := IntToStr(MetersTravelled);
+      TextOut(X - TextWidth(Text), Y, Text);
+      Inc(Y, LineHeight);
+    end;
+
+    Inc(Y, 3 * LineHeight);
+
+    X := Bitmap.Width div 2 + 50;
+    Font.Color := clOrange;
     Winner := Players.GetWinner;
     if Assigned(Winner) then begin
-      Text := SWinnerIs + ' ' + Winner.Name;
-      TextOut(X - TextWidth(Text) div 2, Bitmap.Height div 10 + 60, Text);
+      Text := SWinnerIs;
+      TextOut(X, Y, Text);
+      X := X + TextWidth(Text) + 20;
+      Font.Color := Winner.Color1;
+      Text := Winner.Name;
+      TextOut(X, Y, Text);
     end;
   end;