Changeset 24 for trunk/UCore.pas

Timestamp:

Sep 28, 2011, 9:14:55 PM (13 years ago)

Author:

george

Message:

• Fixed: Up to eight possible players with different colors.
• Fixed: Damage done to correct player shield.

File:

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

trunk/UCore.pas

@@ -204 +204 @@
     (X: 0; Y: 1), (X: -1; Y: 1), (X: -1; Y: 0), (X: -1; Y: -1));
 
-var
-  Engine: TEngine;
-
 function SwapBRComponent(Value: Integer): Integer; inline;
 
@@ -427 +424 @@
     Color := TColor($b600b6);
     Player := 3;
+  end;
+
+  // Player 5 cannon
+  with TMatter(Matter.AddNew(TMatter.Create)) do begin
+    Kind := mkCannon;
+    Color := clYellow;
+    Player := 4;
+  end;
+  // Player 5 home
+  with TMatter(Matter.AddNew(TMatter.Create)) do begin
+    Kind := mkHome;
+    Color := TColor($ffff2c);
+    Player := 4;
+  end;
+  // Player 5 body1
+  with TMatter(Matter.AddNew(TMatter.Create)) do begin
+    Kind := mkTankBody;
+    Color := TColor($ffff2c);
+    Player := 4;
+  end;
+  // Player 5 body2
+  with TMatter(Matter.AddNew(TMatter.Create)) do begin
+    Kind := mkTankBody;
+    Color := TColor($b6b600);
+    Player := 4;
+  end;
+
+  // Player 6 cannon
+  with TMatter(Matter.AddNew(TMatter.Create)) do begin
+    Kind := mkCannon;
+    Color := clYellow;
+    Player := 5;
+  end;
+  // Player 6 home
+  with TMatter(Matter.AddNew(TMatter.Create)) do begin
+    Kind := mkHome;
+    Color :=  TColor($2cffff);
+    Player := 5;
+  end;
+  // Player 6 body1
+  with TMatter(Matter.AddNew(TMatter.Create)) do begin
+    Kind := mkTankBody;
+    Color := TColor($2cffff);
+    Player := 5;
+  end;
+  // Player 6 body2
+  with TMatter(Matter.AddNew(TMatter.Create)) do begin
+    Kind := mkTankBody;
+    Color := TColor($00b6b6);
+    Player := 5;
+  end;
+
+  // Player 7 cannon
+  with TMatter(Matter.AddNew(TMatter.Create)) do begin
+    Kind := mkCannon;
+    Color := clYellow;
+    Player := 6;
+  end;
+  // Player 7 home
+  with TMatter(Matter.AddNew(TMatter.Create)) do begin
+    Kind := mkHome;
+    Color :=  TColor($008cff);
+    Player := 6;
+  end;
+  // Player 7 body1
+  with TMatter(Matter.AddNew(TMatter.Create)) do begin
+    Kind := mkTankBody;
+    Color := TColor($008cff);
+    Player := 6;
+  end;
+  // Player 7 body2
+  with TMatter(Matter.AddNew(TMatter.Create)) do begin
+    Kind := mkTankBody;
+    Color := TColor($002da0);
+    Player := 6;
+  end;
+
+  // Player 8 cannon
+  with TMatter(Matter.AddNew(TMatter.Create)) do begin
+    Kind := mkCannon;
+    Color := clYellow;
+    Player := 7;
+  end;
+  // Player 8 home
+  with TMatter(Matter.AddNew(TMatter.Create)) do begin
+    Kind := mkHome;
+    Color :=  TColor($d0d0d0);
+    Player := 7;
+  end;
+  // Player 8 body1
+  with TMatter(Matter.AddNew(TMatter.Create)) do begin
+    Kind := mkTankBody;
+    Color := TColor($d0d0d0);
+    Player := 7;
+  end;
+  // Player 8 body2
+  with TMatter(Matter.AddNew(TMatter.Create)) do begin
+    Kind := mkTankBody;
+    Color := TColor($707070);
+    Player := 7;
   end;
 end;
@@ -666 +763 @@
           for P := 0 to Engine.Players.Count - 1 do
           with TPlayer(Engine.Players[P]) do
-          if Enabled and (TMatter(Engine.World.Matter[ItemsXY[Pos.X, Pos.Y]]).Kind = mkTankBody) then
+          if (TMatter(Engine.World.Matter[ItemsXY[Pos.X, Pos.Y]]).Kind = mkTankBody) and
+            (TMatter(Engine.World.Matter[ItemsXY[Pos.X, Pos.Y]]).Player = P) then
             Shield := Shield - 1 / ShieldSteps;
           if StopByDirt then Explosion(LastPos, BulletExplosionRange);
@@ -1111 +1209 @@
   with TPlayer(PlayerPool.AddNew(TPlayer.Create)) do begin
     Keys.Left := 76;
-    Keys.Down := 186;
+    Keys.Down := 147;
     Keys.Right := 222;
     Keys.Up := 80;
@@ -1123 +1221 @@
     Keys.Shoot := 105;
   end;
+  with TPlayer(PlayerPool.AddNew(TPlayer.Create)) do begin
+    Keys.Left := 0;
+    Keys.Down := 0;
+    Keys.Right := 0;
+    Keys.Up := 0;
+    Keys.Shoot := 0;
+  end;
+  with TPlayer(PlayerPool.AddNew(TPlayer.Create)) do begin
+    Keys.Left := 0;
+    Keys.Down := 0;
+    Keys.Right := 0;
+    Keys.Up := 0;
+    Keys.Shoot := 0;
+  end;
+  with TPlayer(PlayerPool.AddNew(TPlayer.Create)) do begin
+    Keys.Left := 0;
+    Keys.Down := 0;
+    Keys.Right := 0;
+    Keys.Up := 0;
+    Keys.Shoot := 0;
+  end;
+  with TPlayer(PlayerPool.AddNew(TPlayer.Create)) do begin
+    Keys.Left := 0;
+    Keys.Down := 0;
+    Keys.Right := 0;
+    Keys.Up := 0;
+    Keys.Shoot := 0;
+  end;
   for I := 0 to PlayerPool.Count - 1 do
   with TPlayer(PlayerPool[I]) do begin
@@ -1129 +1255 @@
     InitTanks;
     Name := SPlayer + ' ' + IntToStr(I + 1);
+    Enabled := True;
   end;
 end;
@@ -1230 +1357 @@
   I2: Integer;
 begin
+  Active := False;
   Players.Clear;
   for I := 0 to PlayerPool.Count - 1 do
@@ -1242 +1370 @@
   with TPlayer(Players[I]) do
     Init;
+  ClearBackground := True;
   Redraw;
+  Active := True;
 end;