Changeset 26 for trunk/UCore.pas

Timestamp:

Sep 29, 2011, 8:54:28 PM (13 years ago)

Author:

george

Message:

• Fixed: Wrong shooting through walls.
• Added: Clearing dirt before tank during digging.

File:

• trunk/UCore.pas (modified) (23 diffs)

trunk/UCore.pas

@@ -13 +13 @@
   MaxBulletCount = 10;
   EnergySteps = 4000;
+  EnergyDecreaseDig = 0.001;
   ShieldSteps = 40;
   ExplosionBulletCount = 100;
@@ -20 +21 @@
   BulletExplosionRange = 3;
   ShootDelay = 0.2; // seconds
+  DigDelay = 0.2; // seconds
+  ShootDigDelay = 0.005; // seconds
   ShootEnergyDecrease = 0.01;
+  PlayerFrameWidth = 80;
+  PlayerFrameHeight = 80;
+  PlayerHouseSize = 30;
+  PlayerHouseDoorSize = 8;
 
 type
@@ -59 +66 @@
   end;
 
-  TMatterIndex = (miSpace, miDirt1, miDirt2, miRock, miBullet1, miBullet2,
+  TMatterIndex = (miSpace, miDirt1, miDirt2, miRock, miBullet1, miBullet2, miBorder,
     miPlayer1Cannon, miPlayer1Home, miPlayer1TankBody, miPlayer1TankBody2,
     miPlayer2Cannon, miPlayer2Home, miPlayer2TankBody, miPlayer2TankBody2,
@@ -70 +77 @@
 
   TMatterKind = (mkSpace, mkDirt, mkRock, mkBullet, mkTankBody,
-    mkHome);
+    mkHome, mkBorder);
 
   { TPlayer }
@@ -84 +91 @@
     function ShowTankProc(Item1, Item2: Byte): Byte;
     function HideTankProc(Item1, Item2: Byte): Byte;
+    function DigProc(Item1, Item2: Byte): Byte;
   public
     Id: Integer;
@@ -96 +104 @@
     Bullets: TListObject; // TListObject<TBullet>
     LastShootTime: TDateTime;
+    LastDigTime: TDateTime;
     Energy: Real;
     LastEnergy: Real;
@@ -176 +185 @@
     IntfImage: TLazIntfImage;
     ClearBackground: Boolean;
+    procedure InitDigMasks;
     procedure SetActive(const AValue: Boolean);
     procedure SetBitmap(const AValue: TBitmap);
@@ -187 +197 @@
     PlayerPool: TListObject; // TListObject<TPlayer>
     Players: TListObject; // TListObject<TPlayer>
+    DigMasks: TListObject; // TListObject<TMatrixByte>
     Lock: TCriticalSection;
     constructor Create;
@@ -207 +218 @@
     (X: 0; Y: 1), (X: -1; Y: 1), (X: -1; Y: 0), (X: -1; Y: -1));
 
-function SwapBRComponent(Value: Integer): Integer; inline;
+function SwapBRComponent(Value: Cardinal): Cardinal; inline;
 
 
@@ -216 +227 @@
 
 
-function SwapBRComponent(Value: Integer): Integer;
+function SwapBRComponent(Value: Cardinal): Cardinal; inline;
 begin
 //  Result := (Value and $00ff00) or ((Value shr 16) and $ff) or ((Value and $ff) shl 16);
@@ -326 +337 @@
     Kind := mkBullet;
     Color := clRed;
+    Player := -1;
+  end;
+  // Border
+  with TMatter(Matter.AddNew(TMatter.Create)) do begin
+    Kind := mkBorder;
+    Color := clNavy;
     Player := -1;
   end;
@@ -667 +684 @@
     HideTank;
     Matter := CheckColision;
-    if (Matter = miDirt1) then Dig := not Dig;
-    if (Matter = miSpace) or ((Matter = miDirt1) and (not Dig)) then begin
+    if (Matter = miDirt1) and (
+    (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;
+    end;
+    if (Matter = miSpace) then begin
       Position := NewPosition;
       Direction := NewDirection;
@@ -681 +714 @@
       NewBullet := TBullet.Create;
       NewBullet.Player := Self;
-      NewBullet.Position.X := Position.X + DirectionToDelta[Direction].X * 4;
-      NewBullet.Position.Y := Position.Y + DirectionToDelta[Direction].Y * 4;
+      NewBullet.Position.X := Position.X + DirectionToDelta[Direction].X * 3;
+      NewBullet.Position.Y := Position.Y + DirectionToDelta[Direction].Y * 3;
       NewBullet.Direction.X := DirectionToDelta[Direction].X;
       NewBullet.Direction.Y := DirectionToDelta[Direction].Y;
@@ -807 +840 @@
 //    FillRect(ScreenFrame);
     Fill(CreateIndex(ScreenFrame.Left, ScreenFrame.Top),
-      CreateIndex(ScreenFrame.Right - 1, ScreenFrame.Bottom - 1),
+      CreateIndex(ScreenFrame.Right, ScreenFrame.Bottom),
       TMatter(Engine.World.Matter[Integer(miRock)]).Color);
 
@@ -834 +867 @@
 
 procedure TPlayer.PlaceHouse;
-const
-  HouseSize = 30;
-  DoorSize = 8;
 var
   X, Y: Integer;
   Matter: Byte;
 begin
-  House.AsTRect := Rect(Position.X - HouseSize div 2, Position.Y - HouseSize div 2,
-    Position.X + HouseSize div 2, Position.Y + HouseSize div 2);
-  for Y := 0 to HouseSize - 1 do
-    for X := 0 to HouseSize - 1 do begin
-      if ((Y = 0) or (Y = (HouseSize - 1)) or (X = 0) or (X = (HouseSize - 1))) and
-      not (((Y = 0) or (Y = (HouseSize - 1))) and (X > ((HouseSize - DoorSize) div 2)) and
-      (X < ((HouseSize - 1 + DoorSize) div 2)))
+  House.AsTRect := Rect(Position.X - PlayerHouseSize div 2, Position.Y - PlayerHouseSize div 2,
+    Position.X + PlayerHouseSize div 2, Position.Y + PlayerHouseSize div 2);
+  for Y := 0 to PlayerHouseSize - 1 do
+    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)))
       then Matter := Byte(miPlayer1Home) + Id * 4
         else Matter := Byte(miSpace);
@@ -907 +937 @@
 begin
   if Item2 > 0 then Result := 0 else Result := Item1;
+end;
+
+function TPlayer.DigProc(Item1, Item2: Byte): Byte;
+begin
+  if ((Item1 = Integer(miDirt1)) or (Item1 = Integer(miDirt2))) and (Item2 = 1) then
+    Result := Integer(miSpace) else Result := Item1;
 end;
 
@@ -1126 +1162 @@
   TargetHeight: Integer;
   TargetWidth: Integer;
+  BgColor: Cardinal;
 begin
   if Assigned(FBitmap) then
@@ -1134 +1171 @@
     BytePerRow := RawImage.Description.BytesPerLine;
     if ClearBackground then begin
-      FillChar(RawImage.Data^, Bitmap.Height * BytePerRow, 0);
+      BgColor := TMatter(World.Matter[Integer(miBorder)]).Color;
+      BgColor := SwapBRComponent(BgColor);
+      FillDWord(RawImage.Data^, Bitmap.Height * BytePerRow div 4, BgColor);
       ClearBackground := False;
     end;
@@ -1195 +1234 @@
 end;
 
+procedure TEngine.InitDigMasks;
+var
+  NewMask: TMatrixByte;
+  I: Integer;
+  X, Y: Integer;
+begin
+  DigMasks.Clear;
+
+  // 001111100
+  // 0111A1110
+  // 00z1A1z00
+  // 00zxAxz00
+  // 00zxAxz00
+  // 00zxxxz00
+  // 00z000z00
+  // 000000000
+  // 000000000
+
+  NewMask := TMatrixByte.Create;
+  with NewMask do begin
+    Count := CreateIndex(9, 9);
+    for I := 0 to 4 do ItemsXY[2 + I, 0] := 1;
+    for I := 0 to 2 do begin
+      ItemsXY[1 + I, 1] := 1;
+      ItemsXY[5 + I, 1] := 1;
+    end;
+    ItemsXY[3, 2] := 1;
+    ItemsXY[5, 2] := 1;
+  end;
+  DigMasks.Add(NewMask);
+
+  // 000011110
+  // 0000z1111
+  // 000zx1A11
+  // 00zxxA111
+  // 0zxxAxxz1
+  // 000xxxz00
+  // 0000xz000
+  // 0000z0000
+  // 000000000
+
+  NewMask := TMatrixByte.Create;
+  with NewMask do begin
+    Count := CreateIndex(9, 9);
+    for I := 0 to 3 do begin
+      ItemsXY[4 + I, 0] := 1;
+      ItemsXY[5 + I, 1] := 1;
+    end;
+    ItemsXY[5, 2] := 1;
+    ItemsXY[7, 2] := 1;
+    ItemsXY[8, 2] := 1;
+    for I := 0 to 2 do
+      ItemsXY[6 + I, 3] := 1;
+    ItemsXY[8, 4] := 1;
+  end;
+  DigMasks.Add(NewMask);
+
+  NewMask := TMatrixByte.Create;
+  NewMask.Assign(TMatrixByte(DigMasks[0]));
+  NewMask.Reverse;
+  NewMask.ReverseHorizontal;
+  DigMasks.Add(NewMask);
+
+  NewMask := TMatrixByte.Create;
+  NewMask.Assign(TMatrixByte(DigMasks[1]));
+  NewMask.ReverseVertical;
+  DigMasks.Add(NewMask);
+
+  NewMask := TMatrixByte.Create;
+  NewMask.Assign(TMatrixByte(DigMasks[0]));
+  NewMask.ReverseVertical;
+  DigMasks.Add(NewMask);
+
+  NewMask := TMatrixByte.Create;
+  NewMask.Assign(TMatrixByte(DigMasks[1]));
+  NewMask.ReverseVertical;
+  NewMask.ReverseHorizontal;
+  DigMasks.Add(NewMask);
+
+  NewMask := TMatrixByte.Create;
+  NewMask.Assign(TMatrixByte(DigMasks[0]));
+  NewMask.Reverse;
+  DigMasks.Add(NewMask);
+
+  NewMask := TMatrixByte.Create;
+  NewMask.Assign(TMatrixByte(DigMasks[1]));
+  NewMask.ReverseHorizontal;
+  DigMasks.Add(NewMask);
+end;
+
 procedure TEngine.InitPlayerPool;
 var
@@ -1283 +1412 @@
       HorizFrameCount := 1;
     end;
-    FBitmapLower.Count := FBitmapLower.CreateIndex(80 * HorizFrameCount, 60 * VertFrameCount);
+    FBitmapLower.Count := FBitmapLower.CreateIndex(PlayerFrameWidth * HorizFrameCount,
+      PlayerFrameHeight * VertFrameCount);
     for I := 0 to Players.Count - 1 do begin
       TPlayer(Players[I]).ScreenFrame.AsTRect := Rect(
-        (I mod HorizFrameCount) * (FBitmapLower.Count.X div HorizFrameCount),
-        (I div HorizFrameCount) * (FBitmapLower.Count.Y div VertFrameCount),
+        (I mod HorizFrameCount) * (FBitmapLower.Count.X div HorizFrameCount) + 1,
+        (I div HorizFrameCount) * (FBitmapLower.Count.Y div VertFrameCount) + 1,
         ((I mod HorizFrameCount) + 1) * (FBitmapLower.Width div HorizFrameCount),
         ((I div HorizFrameCount) + 1) * (FBitmapLower.Height div VertFrameCount));
@@ -1309 +1439 @@
   World.Engine := Self;
   InitPlayerPool;
+  DigMasks := TListObject.Create;
+  InitDigMasks;
   Redraw;
 end;
@@ -1315 +1447 @@
 begin
   Active := False;
+  DigMasks.Free;
   FBitmapLower.Free;
   FBitmapLock.Free;
@@ -1350 +1483 @@
     try
       Lock.Acquire;
-      //FBitmapLower.FillAll(0);
+      if ClearBackground then FBitmapLower.FillAll(clNavy);
       for I := 0 to Players.Count - 1 do begin
         TPlayer(Players[I]).Paint;