Changeset 66 for trunk

Timestamp:

Jan 7, 2023, 11:06:35 PM (2 years ago)

Author:

chronos

Message:

• Fixed: Home doors size.
• Modified: Use movemenet energy decrease instead of dig energy decrease.

File:

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

trunk/UEngine.pas

@@ -6 +6 @@
   Dialogs, Classes, SysUtils, Graphics, SpecializedMatrix, URegistry,
   IntfGraphics, FPImage, LCLType, SpecializedBitmap, GraphType, Math, URectangle,
-  Syncobjs, UThreading, Forms, DateUtils, UAudioSystem, XMLConf, DOM,
-  Generics.Collections, UWorld, UMatter;
+  Syncobjs, UThreading, Forms, DateUtils, UAudioSystem, Generics.Collections,
+  UWorld, UMatter;
 
 const
   MaxBulletCount = 10;
-  EnergySteps = 4000;
-  EnergyDecreaseDig = 0.001;
-  EnergyDecreaseShoot = 0.005;
+  EnergyDecreaseDig = 0;
+  EnergyDecreaseMove = 0.00025; // ~2.5 minutes of movement
+  EnergyDecreaseShoot = 0.005; // ~20 seconds of shooting
+  EnergyDecreaseOutside = 0.00003; // ~5 minutes of live
+  EnergyIncreaseHome = 0.001;
   ShieldSteps = 40;
   ExplosionBulletCount = 100;
@@ -26 +28 @@
   PlayerFrameWidth = 80;
   PlayerFrameHeight = 80;
-  PlayerHouseSize = 30;
-  PlayerHouseDoorSize = 8;
+  PlayerHouseSize = 29;
+  PlayerHouseDoorSize = 7;
   ExplosionDelay = 2;
   NewRoundDelay = 2;
@@ -476 +478 @@
       CheckNewDestination;
     end else begin
-        NewPosition := Position;
-        if not CheckNewDestination then begin
-          // if direction is changed then try to check movement plus one step
-          // to prevent tank block
-          NewPosition := Point(Position.X + Delta.X, Position.Y + Delta.Y);
-          CheckNewDestination;
-        end;
+      NewPosition := Position;
+      if not CheckNewDestination then begin
+        // if direction is changed then try to check movement plus one step
+        // to prevent tank block
+        NewPosition := Point(Position.X + Delta.X, Position.Y + Delta.Y);
+        CheckNewDestination;
       end;
+    end;
   end;
 
@@ -520 +522 @@
     if ColisionState.Diggable then begin
       if (Engine.KeyBoard.KeyState[Ord(Keys.Shoot)] and
-    ((Now - LastDigTime) > ShootDigDelay * OneSecond)) or
-    (not Engine.KeyBoard.KeyState[Ord(Keys.Shoot)] and
-    ((Now - LastDigTime) > DigDelay * OneSecond)) then begin
-      Dig := not Dig;
-      with Engine, World do
-      Surface.Merge(Surface.CreateIndex(
-        Position.X - TMatrixByte(DigMasks[Direction]).Count.X div 2,
-        Position.Y - TMatrixByte(DigMasks[Direction]).Count.Y div 2),
-        TMatrixByte(DigMasks[Direction]), DigProc);
-      Energy := Energy - EnergyDecreaseDig;
-      if Energy < 0 then Energy := 0;
-      Engine.Redraw;
-      LastDigTime := Now;
-      Direction := NewDirection;
-      Result := True;
+      ((Now - LastDigTime) > ShootDigDelay * OneSecond)) or
+      (not Engine.KeyBoard.KeyState[Ord(Keys.Shoot)] and
+      ((Now - LastDigTime) > DigDelay * OneSecond)) then begin
+        Dig := not Dig;
+        with Engine, World do
+        Surface.Merge(Surface.CreateIndex(
+          Position.X - TMatrixByte(DigMasks[Direction]).Count.X div 2,
+          Position.Y - TMatrixByte(DigMasks[Direction]).Count.Y div 2),
+          TMatrixByte(DigMasks[Direction]), DigProc);
+        Energy := Energy - EnergyDecreaseDig;
+        if Energy < 0 then Energy := 0;
+        Engine.Redraw;
+        LastDigTime := Now;
+        Direction := NewDirection;
+        Result := True;
       end;
     end else begin
@@ -543 +545 @@
         Engine.Redraw;
         LastMoveTime := Now;
+        Energy := Energy - EnergyDecreaseMove;
       end;
     end;
@@ -558 +561 @@
   if not ExplosionPending then begin
     if not Engine.IsInsideHouses(Position) then begin
-      Energy := Energy - 1 / EnergySteps;
+      Energy := Energy - EnergyDecreaseOutside;
     end else begin
       if not Exploded then
-        Energy := Energy + 5 * 1 / EnergySteps;
+        Energy := Energy + EnergyIncreaseHome;
       if Energy > 1 then Energy := 1;
     end;
@@ -711 +714 @@
     for X := 0 to PlayerHouseSize - 1 do begin
       if ((Y = 0) or (Y = (PlayerHouseSize - 1)) or (X = 0) or (X = (PlayerHouseSize - 1))) and
-      not (((Y = 0) or (Y = (PlayerHouseSize - 1))) and (X > ((PlayerHouseSize - PlayerHouseDoorSize) div 2)) and
-      (X < ((PlayerHouseSize - 1 + PlayerHouseDoorSize) div 2)))
+      not (((Y = 0) or (Y = (PlayerHouseSize - 1))) and
+      (X >= ((PlayerHouseSize - PlayerHouseDoorSize) div 2)) and
+      (X <= ((PlayerHouseSize - 1 + PlayerHouseDoorSize) div 2)))
       then Matter := Byte(miPlayer1Home) + Id * 4
         else Matter := Byte(miSpace);
@@ -1787 +1791 @@
       State := gsMenu;
     end;
+  end else
+  if State = gsGame then begin
+     if Key = KeyEsc then begin
+       State := gsMap;
+     end;
   end;
 
@@ -1799 +1808 @@
       end;
     end;
-  end else
-  if (State = gsGame) and (Key = KeyF5) then begin
-    State := gsMap;
   end;
   {$ENDIF}