Changeset 22 for trunk/UCore.pas

Timestamp:

Sep 28, 2011, 3:10:01 PM (13 years ago)

Author:

george

Message:

• Added: Definition class for surface matter types.

File:

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

trunk/UCore.pas

@@ -24 +24 @@
   TPlayer = class;
 
-  TSurfaceMatter = (smNothing, smDirt1, smDirt2, smRock, smCannon,
-    smBullet1, smBullet2,
-    smPlayer1H, smPlayer1L, smPlayer2H, smPlayer2L,
-    smPlayer3H, smPlayer3L, smPlayer4H, smPlayer4L);
-
   TRealPoint = record
     X, Y: Real;
@@ -61 +56 @@
     destructor Destroy; override;
   end;
+
+  TMatterIndex = (miSpace, miDirt1, miDirt2, miRock, miBullet1, miBullet2,
+    miPlayer1Cannon, miPlayer1Home, miPlayer1TankBody, miPlayer1TankBody2,
+    miPlayer2Cannon, miPlayer2Home, miPlayer2TankBody, miPlayer2TankBody2,
+    miPlayer3Cannon, miPlayer3Home, miPlayer3TankBody, miPlayer3TankBody2,
+    miPlayer4Cannon, miPlayer4Home, miPlayer4TankBody, miPlayer4TankBody2,
+    miPlayer5Cannon, miPlayer5Home, miPlayer5TankBody, miPlayer5TankBody2,
+    miPlayer6Cannon, miPlayer6Home, miPlayer6TankBody, miPlayer6TankBody2,
+    miPlayer7Cannon, miPlayer7Home, miPlayer7TankBody, miPlayer7TankBody2,
+    miPlayer8Cannon, miPlayer8Home, miPlayer8TankBody, miPlayer8TankBody2);
+
+  TMatterKind = (mkSpace, mkDirt, mkRock, mkCannon, mkBullet, mkTankBody,
+    mkHome);
 
   { TPlayer }
@@ -96 +104 @@
     procedure Paint;
     procedure PlaceHouse;
-    function CheckColision: TSurfaceMatter;
+    function CheckColision: TMatterIndex;
     procedure ShowTank;
     procedure HideTank;
@@ -105 +113 @@
   end;
 
+  { TMatter }
+
+  TMatter = class
+    Kind: TMatterKind;
+    Player: Integer;
+    Color: TColor;
+  end;
+
   { TWorld }
 
@@ -111 +127 @@
     function GetSize: TMatrixByteIndex;
     procedure SetSize(const AValue: TMatrixByteIndex);
+    procedure InitMatter;
   public
     Engine: TEngine;
     Surface: TMatrixByte;
+    Matter: TListObject; // TListObject<TMatter>
     procedure Generate;
     constructor Create;
@@ -183 +201 @@
 
 const
-  SurfaceMatterColors: array[TSurfaceMatter] of TColor = (clBlack, $0756b0,
-    $2170c3, TColor($9a9a9a), clYellow, clRed, clRed,
-    TColor($00ff00), TColor($00a000), TColor($ff2c2c), TColor($b60000),
-    TColor($0000ff), TColor($0000a0), TColor($ff2cff), TColor($b600b6));
   DirectionToDelta: array[0..7] of TPoint =
     ((X: 0; Y: -1), (X: 1; Y: -1), (X: 1; Y: 0), (X: 1; Y: 1),
@@ -273 +287 @@
 end;
 
+procedure TWorld.InitMatter;
+begin
+  // Space
+  with TMatter(Matter.AddNew(TMatter.Create)) do begin
+    Kind := mkSpace;
+    Color := clBlack;
+    Player := -1;
+  end;
+  // Dirt1
+  with TMatter(Matter.AddNew(TMatter.Create)) do begin
+    Kind := mkDirt;
+    Color := $0756b0;
+    Player := -1;
+  end;
+  // Dirt2
+  with TMatter(Matter.AddNew(TMatter.Create)) do begin
+    Kind := mkDirt;
+    Color := $2170c3;
+    Player := -1;
+  end;
+  // Rock
+  with TMatter(Matter.AddNew(TMatter.Create)) do begin
+    Kind := mkRock;
+    Color := TColor($9a9a9a);
+    Player := -1;
+  end;
+  // Bullet1
+  with TMatter(Matter.AddNew(TMatter.Create)) do begin
+    Kind := mkBullet;
+    Color := clRed;
+    Player := -1;
+  end;
+  // Bullet2
+  with TMatter(Matter.AddNew(TMatter.Create)) do begin
+    Kind := mkBullet;
+    Color := clRed;
+    Player := -1;
+  end;
+
+  // Player 1 cannon
+  with TMatter(Matter.AddNew(TMatter.Create)) do begin
+    Kind := mkCannon;
+    Color := clYellow;
+    Player := 0;
+  end;
+  // Player 1 home
+  with TMatter(Matter.AddNew(TMatter.Create)) do begin
+    Kind := mkHome;
+    Color := TColor($00ff00);
+    Player := 0;
+  end;
+  // Player 1 body1
+  with TMatter(Matter.AddNew(TMatter.Create)) do begin
+    Kind := mkTankBody;
+    Color := TColor($00ff00);
+    Player := 0;
+  end;
+  // Player 1 body2
+  with TMatter(Matter.AddNew(TMatter.Create)) do begin
+    Kind := mkTankBody;
+    Color := TColor($00a000);
+    Player := 0;
+  end;
+
+  // Player 2 cannon
+  with TMatter(Matter.AddNew(TMatter.Create)) do begin
+    Kind := mkCannon;
+    Color := clYellow;
+    Player := 1;
+  end;
+  // Player 2 home
+  with TMatter(Matter.AddNew(TMatter.Create)) do begin
+    Kind := mkHome;
+    Color :=  TColor($ff2c2c);
+    Player := 1;
+  end;
+  // Player 2 body1
+  with TMatter(Matter.AddNew(TMatter.Create)) do begin
+    Kind := mkTankBody;
+    Color := TColor($ff2c2c);
+    Player := 1;
+  end;
+  // Player 2 body2
+  with TMatter(Matter.AddNew(TMatter.Create)) do begin
+    Kind := mkTankBody;
+    Color := TColor($b60000);
+    Player := 1;
+  end;
+
+  // Player 3 cannon
+  with TMatter(Matter.AddNew(TMatter.Create)) do begin
+    Kind := mkCannon;
+    Color := clYellow;
+    Player := 2;
+  end;
+  // Player 3 home
+  with TMatter(Matter.AddNew(TMatter.Create)) do begin
+    Kind := mkHome;
+    Color :=  TColor($0000ff);
+    Player := 2;
+  end;
+  // Player 3 body1
+  with TMatter(Matter.AddNew(TMatter.Create)) do begin
+    Kind := mkTankBody;
+    Color := TColor($0000ff);
+    Player := 2;
+  end;
+  // Player 3 body2
+  with TMatter(Matter.AddNew(TMatter.Create)) do begin
+    Kind := mkTankBody;
+    Color := TColor($0000a0);
+    Player := 2;
+  end;
+
+  // Player 4 cannon
+  with TMatter(Matter.AddNew(TMatter.Create)) do begin
+    Kind := mkCannon;
+    Color := clYellow;
+    Player := 3;
+  end;
+  // Player 4 home
+  with TMatter(Matter.AddNew(TMatter.Create)) do begin
+    Kind := mkHome;
+    Color :=  TColor($ff2cff);
+    Player := 3;
+  end;
+  // Player 4 body1
+  with TMatter(Matter.AddNew(TMatter.Create)) do begin
+    Kind := mkTankBody;
+    Color := TColor($ff2cff);
+    Player := 3;
+  end;
+  // Player 4 body2
+  with TMatter(Matter.AddNew(TMatter.Create)) do begin
+    Kind := mkTankBody;
+    Color := TColor($b600b6);
+    Player := 3;
+  end;
+end;
+
 procedure TWorld.Generate;
 var
@@ -282 +436 @@
     for X := 0 to Surface.Count.X - 1 do begin
       if Random < 0.5 then
-        Surface.ItemsXY[X, Y] := Byte(smDirt1) else
-        Surface.ItemsXY[X, Y] := Byte(smDirt2);
+        Surface.ItemsXY[X, Y] := Byte(miDirt1) else
+        Surface.ItemsXY[X, Y] := Byte(miDirt2);
     end;
 
@@ -290 +444 @@
   for Y := 0 to Surface.Count.Y - 1 do begin
     for X := 0 to Round(Distance) - 1 do begin
-      Surface.ItemsXY[X, Y] := Byte(smRock);
+      Surface.ItemsXY[X, Y] := Byte(miRock);
     end;
     Delta := (Random * 2 - 1) * 3 - (Distance / (0.1 * Surface.Count.X) * 2 - 1);
@@ -300 +454 @@
   for Y := 0 to Surface.Count.Y - 1 do begin
     for X := 0 to Round(Distance) - 1 do begin
-      Surface.ItemsXY[Surface.Count.X - 1 - X, Y] := Byte(smRock);
+      Surface.ItemsXY[Surface.Count.X - 1 - X, Y] := Byte(miRock);
     end;
     Delta := (Random * 2 - 1) * 3 - (Distance / (0.1 * Surface.Count.X) * 2 - 1);
@@ -310 +464 @@
   for X := 0 to Surface.Count.X - 1 do begin
     for Y := 0 to Round(Distance) - 1 do begin
-      Surface.ItemsXY[X, Y] := Byte(smRock);
+      Surface.ItemsXY[X, Y] := Byte(miRock);
     end;
     Delta := (Random * 2 - 1) * 3 - (Distance / (0.1 * Surface.Count.Y) * 2 - 1);
@@ -320 +474 @@
   for X := 0 to Surface.Count.X - 1 do begin
     for Y := 0 to Round(Distance) - 1 do begin
-      Surface.ItemsXY[X, Surface.Count.Y - 1 - Y] := Byte(smRock);
+      Surface.ItemsXY[X, Surface.Count.Y - 1 - Y] := Byte(miRock);
     end;
     Delta := (Random * 2 - 1) * 3 - (Distance / (0.1 * Surface.Count.Y) * 2 - 1);
@@ -331 +485 @@
   NewSize: TMatrixByteIndex;
 begin
+  Matter := TListObject.Create;
+  InitMatter;
   Surface := TMatrixByte.Create;
   NewSize.X := 800;
@@ -340 +496 @@
 begin
   Surface.Free;
+  Matter.Free;
   inherited Destroy;
 end;
@@ -360 +517 @@
       PixelPtr := PixelRowPtr;
       for X := 0 to Bitmap.Width - 1 do begin
-        P := SurfaceMatterColors[TSurfaceMatter(
-          Surface.ItemsXY[Trunc(X / Bitmap.Width * Surface.Count.X),
-            Trunc(Y / Bitmap.Height * Surface.Count.Y)])];
+        P := TMatter(Matter[Surface.ItemsXY[Trunc(X / Bitmap.Width * Surface.Count.X),
+            Trunc(Y / Bitmap.Height * Surface.Count.Y)]]).Color;
         PixelPtr^ := SwapBRComponent(P);
         Inc(PByte(PixelPtr), BytePerPixel);
@@ -378 +534 @@
 var
   Delta: TPoint;
-  Matter: TSurfaceMatter;
+  Matter: TMatterIndex;
   NewBullet: TBullet;
   I: Integer;
@@ -408 +564 @@
     HideTank;
     Matter := CheckColision;
-    if (Matter = smDirt1) then Dig := not Dig;
-    if (Matter = smNothing) or ((Matter = smDirt1) and (not Dig)) then begin
+    if (Matter = miDirt1) then Dig := not Dig;
+    if (Matter = miSpace) or ((Matter = miDirt1) and (not Dig)) then begin
       Position := NewPosition;
       Direction := NewDirection;
@@ -474 +630 @@
   with TBullet(Bullets[I]), Engine.World.Surface do begin
     Pos := Point(Trunc(Position.X), Trunc(Position.Y));
-    if (ItemsXY[LastPos.X, LastPos.Y] = Byte(smBullet1)) or
-      (ItemsXY[LastPos.X, LastPos.Y] = Byte(smBullet2)) then
-      ItemsXY[LastPos.X, LastPos.Y] := Byte(smNothing);
+    if (ItemsXY[LastPos.X, LastPos.Y] = Byte(miBullet1)) or
+      (ItemsXY[LastPos.X, LastPos.Y] = Byte(miBullet2)) then
+      ItemsXY[LastPos.X, LastPos.Y] := Byte(miSpace);
     LastPos := Pos;
 
@@ -491 +647 @@
     Pos := Point(Trunc(Position.X), Trunc(Position.Y));
 
-    if (ItemsXY[Pos.X, Pos.Y] <> Byte(smNothing)) and
-    (ItemsXY[Pos.X, Pos.Y] <> Byte(smBullet1)) and
-    (ItemsXY[Pos.X, Pos.Y] <> Byte(smBullet2)) then begin
-      if (ItemsXY[Pos.X, Pos.Y] = Byte(smDirt1)) or
-        (ItemsXY[Pos.X, Pos.Y] = Byte(smDirt2)) then begin
-          ItemsXY[Pos.X, Pos.Y] := Byte(smNothing);
+    if (ItemsXY[Pos.X, Pos.Y] <> Byte(miSpace)) and
+    (ItemsXY[Pos.X, Pos.Y] <> Byte(miBullet1)) and
+    (ItemsXY[Pos.X, Pos.Y] <> Byte(miBullet2)) then begin
+      if (ItemsXY[Pos.X, Pos.Y] = Byte(miDirt1)) or
+        (ItemsXY[Pos.X, Pos.Y] = Byte(miDirt2)) then begin
+          ItemsXY[Pos.X, Pos.Y] := Byte(miSpace);
           if StopByDirt then begin
             Explosion(LastPos, BulletExplosionRange);
@@ -504 +660 @@
           end;
         end else begin
-          if (ItemsXY[Pos.X, Pos.Y] = Byte(smPlayer1L)) or (ItemsXY[Pos.X, Pos.Y] = Byte(smPlayer1H)) then
+          if (ItemsXY[Pos.X, Pos.Y] = Byte(miPlayer1TankBody)) or
+          (ItemsXY[Pos.X, Pos.Y] = Byte(miPlayer1TankBody2)) then
             with TPlayer(Engine.Players[0]) do begin
               Shield := Shield - 1 / ShieldSteps;
             end;
-          if (ItemsXY[Pos.X, Pos.Y] = Byte(smPlayer2L)) or (ItemsXY[Pos.X, Pos.Y] = Byte(smPlayer2H)) then
+          if (ItemsXY[Pos.X, Pos.Y] = Byte(miPlayer2Tankbody)) or
+          (ItemsXY[Pos.X, Pos.Y] = Byte(miPlayer2TankBody2)) then
             with TPlayer(Engine.Players[1]) do begin
               Shield := Shield - 1 / ShieldSteps;
             end;
-          if (ItemsXY[Pos.X, Pos.Y] = Byte(smPlayer3L)) or (ItemsXY[Pos.X, Pos.Y] = Byte(smPlayer3H)) then
+          if (ItemsXY[Pos.X, Pos.Y] = Byte(miPlayer3TankBody)) or
+          (ItemsXY[Pos.X, Pos.Y] = Byte(miPlayer3TankBody2)) then
             with TPlayer(Engine.Players[2]) do begin
               Shield := Shield - 1 / ShieldSteps;
             end;
-          if (ItemsXY[Pos.X, Pos.Y] = Byte(smPlayer4L)) or (ItemsXY[Pos.X, Pos.Y] = Byte(smPlayer4H)) then
+          if (ItemsXY[Pos.X, Pos.Y] = Byte(miPlayer4TankBody)) or
+          (ItemsXY[Pos.X, Pos.Y] = Byte(miPlayer4TankBody2)) then
             with TPlayer(Engine.Players[3]) do begin
               Shield := Shield - 1 / ShieldSteps;
@@ -534 +694 @@
         Continue;
       end;
-    ItemsXY[Pos.X, Pos.Y] := Byte(smBullet1);
+    ItemsXY[Pos.X, Pos.Y] := Byte(miBullet1);
     //Engine.World.Surface.ItemsXY[LastPos.X, LastPos.Y] := Byte(smBullet2);
     Engine.Redraw;
@@ -552 +712 @@
 //    FillRect(ScreenFrame);
     Fill(CreateIndex(ScreenFrame.Left, ScreenFrame.Top),
-      CreateIndex(ScreenFrame.Right - 1, ScreenFrame.Bottom - 1), SurfaceMatterColors[smRock]);
+      CreateIndex(ScreenFrame.Right - 1, ScreenFrame.Bottom - 1),
+      TMatter(Engine.World.Matter[Integer(miRock)]).Color);
 
     with Engine.World do
@@ -560 +721 @@
         YY := Y - ScreenFrame.Top - ((ScreenFrame.Bottom - ScreenFrame.Top) div 2) + Position.Y;
         if (YY >= 0) and (YY < Surface.Count.Y) and (XX >= 0) and (XX < Surface.Count.X) then
-          ItemsXY[X, Y] := SurfaceMatterColors[TSurfaceMatter(Surface.ItemsXY[XX, YY])];
+          ItemsXY[X, Y] := TMatter(Engine.World.Matter[Surface.ItemsXY[XX, YY]]).Color;
       end;
 
@@ -592 +753 @@
       not (((Y = 0) or (Y = (HouseSize - 1))) and (X > ((HouseSize - DoorSize) div 2)) and
       (X < ((HouseSize - 1 + DoorSize) div 2)))
-      then Matter := Byte(smPlayer1H) + Id * 2
-        else Matter := Byte(smNothing);
+      then Matter := Byte(miPlayer1Cannon) + Id * 4
+        else Matter := Byte(miSpace);
       Engine.World.Surface.ItemsXY[House.Left + X,
         House.Top + Y] := Matter;
@@ -599 +760 @@
 end;
 
-function TPlayer.CheckColision: TSurfaceMatter;
+function TPlayer.CheckColision: TMatterIndex;
 var
   X, Y: Integer;
   XX, YY: Integer;
 begin
-  Result := smNothing;
+  Result := miSpace;
   with Engine.World, TTank(Tanks[NewDirection]) do
   for Y := 0 to Image.Count.Y - 1 do
@@ -611 +772 @@
     YY := Y + NewPosition.Y - Image.Count.Y div 2;
     if (Image.ItemsXY[X, Y] > 0) and
-    (Surface.ItemsXY[XX, YY] <> Byte(smNothing)) then
+    (Surface.ItemsXY[XX, YY] <> Byte(miSpace)) then
     begin
-      Result := smDirt1;
-      if (Surface.ItemsXY[XX, YY] <> Byte(smDirt1)) and
-      (Surface.ItemsXY[XX, YY] <> Byte(smDirt2)) then
+      Result := miDirt1;
+      if (Surface.ItemsXY[XX, YY] <> Byte(miDirt1)) and
+      (Surface.ItemsXY[XX, YY] <> Byte(miDirt2)) then
       begin
-        Result := TSurfaceMatter(Surface.ItemsXY[XX, YY]);
+        Result := TMatterIndex(Surface.ItemsXY[XX, YY]);
         Exit;
       end;
@@ -709 +870 @@
     Image.Count := Image.CreateIndex(7, 7);
     for I := 0 to 3 do
-      Image[3, I] := Byte(smCannon);
+      Image[3, I] := Byte(miPlayer1Cannon) + Id * 4;
     for I := 1 to 6 do begin
-      Image[1, I] := Byte(smPlayer1H) + Id * 2;
-      Image[5, I] := Byte(smPlayer1H) + Id * 2;
+      Image[1, I] := Byte(miPlayer1TankBody) + Id * 4;
+      Image[5, I] := Byte(miPlayer1TankBody) + Id * 4;
     end;
     for I := 2 to 5 do begin
-      Image[2, I] := Byte(smPlayer1H) + Id * 2 + 1;
-      Image[4, I] := Byte(smPlayer1H) + Id * 2 + 1;
-    end;
-    Image[3, 4] := Byte(smPlayer1H) + Id * 2 + 1;
-    Image[3, 5] := Byte(smPlayer1H) + Id * 2 + 1;
+      Image[2, I] := Byte(miPlayer1TankBody2) + Id * 4;
+      Image[4, I] := Byte(miPlayer1TankBody2) + Id * 4;
+    end;
+    Image[3, 4] := Byte(miPlayer1TankBody2) + Id * 4;
+    Image[3, 5] := Byte(miPlayer1TankBody2) + Id * 4;
   end;
   Tanks.Add(NewTank);
@@ -727 +888 @@
     Image.Count := Image.CreateIndex(7, 7);
     for I := 0 to 2 do
-      Image[3 + I, 3 - I] := Byte(smCannon);
+      Image[3 + I, 3 - I] := Byte(miPlayer1Cannon) + Id * 4;
     for I := 0 to 3 do begin
-      Image[I, 3 - I] := Byte(smPlayer1H) + Id * 2;
-      Image[3 + I, 6 - I] := Byte(smPlayer1H) + Id * 2;
+      Image[I, 3 - I] := Byte(miPlayer1TankBody) + Id * 4;
+      Image[3 + I, 6 - I] := Byte(miPlayer1TankBody) + Id * 4;
     end;
     for I := 0 to 2 do begin
-      Image[1 + I, 3 - I] := Byte(smPlayer1H) + Id * 2 + 1;
-      Image[3 + I, 5 - I] := Byte(smPlayer1H) + Id * 2 + 1;
-    end;
-    Image[3, 2] := Byte(smPlayer1H) + Id * 2 + 1;
-    Image[2, 3] := Byte(smPlayer1H) + Id * 2 + 1;
-    Image[2, 4] := Byte(smPlayer1H) + Id * 2 + 1;
-    Image[3, 4] := Byte(smPlayer1H) + Id * 2 + 1;
-    Image[4, 3] := Byte(smPlayer1H) + Id * 2 + 1;
+      Image[1 + I, 3 - I] := Byte(miPlayer1TankBody2) + Id * 4;
+      Image[3 + I, 5 - I] := Byte(miPlayer1TankBody2) + Id * 4;
+    end;
+    Image[3, 2] := Byte(miPlayer1TankBody2) + Id * 4;
+    Image[2, 3] := Byte(miPlayer1TankBody2) + Id * 4;
+    Image[2, 4] := Byte(miPlayer1TankBody2) + Id * 4;
+    Image[3, 4] := Byte(miPlayer1TankBody2) + Id * 4;
+    Image[4, 3] := Byte(miPlayer1TankBody2) + Id * 4;
   end;
   Tanks.Add(NewTank);