Changeset 25 for trunk/UCore.pas

Timestamp:

Sep 29, 2011, 6:03:28 PM (13 years ago)

Author:

george

Message:

• Added: Decrease tank energy on bullet fire.
• Fixed: Do not hit self by own bullets.
• Fixed: Shoot bullets in minimum interval.

File:

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

trunk/UCore.pas

@@ -8 +8 @@
   Dialogs, Classes, SysUtils, Contnrs, Graphics, SpecializedMatrix, SpecializedList,
   IntfGraphics, FPImage, LCLType, SpecializedBitmap, GraphType, Math, URectangle,
-  Syncobjs, UThreading, Forms;
+  Syncobjs, UThreading, Forms, DateUtils;
 
 const
@@ -19 +19 @@
   ExplosionBulletMinSpeed = 0.2;
   BulletExplosionRange = 3;
+  ShootDelay = 0.2; // seconds
+  ShootEnergyDecrease = 0.01;
 
 type
@@ -67 +69 @@
     miPlayer8Cannon, miPlayer8Home, miPlayer8TankBody, miPlayer8TankBody2);
 
-  TMatterKind = (mkSpace, mkDirt, mkRock, mkCannon, mkBullet, mkTankBody,
+  TMatterKind = (mkSpace, mkDirt, mkRock, mkBullet, mkTankBody,
     mkHome);
 
@@ -93 +95 @@
     Tanks: TListObject; // TListObject<TTank>
     Bullets: TListObject; // TListObject<TBullet>
+    LastShootTime: TDateTime;
     Energy: Real;
     LastEnergy: Real;
@@ -328 +331 @@
   // Player 1 cannon
   with TMatter(Matter.AddNew(TMatter.Create)) do begin
-    Kind := mkCannon;
+    Kind := mkTankBody;
     Color := clYellow;
     Player := 0;
@@ -353 +356 @@
   // Player 2 cannon
   with TMatter(Matter.AddNew(TMatter.Create)) do begin
-    Kind := mkCannon;
+    Kind := mkTankBody;
     Color := clYellow;
     Player := 1;
@@ -378 +381 @@
   // Player 3 cannon
   with TMatter(Matter.AddNew(TMatter.Create)) do begin
-    Kind := mkCannon;
+    Kind := mkTankBody;
     Color := clYellow;
     Player := 2;
@@ -403 +406 @@
   // Player 4 cannon
   with TMatter(Matter.AddNew(TMatter.Create)) do begin
-    Kind := mkCannon;
+    Kind := mkTankBody;
     Color := clYellow;
     Player := 3;
@@ -428 +431 @@
   // Player 5 cannon
   with TMatter(Matter.AddNew(TMatter.Create)) do begin
-    Kind := mkCannon;
+    Kind := mkTankBody;
     Color := clYellow;
     Player := 4;
@@ -453 +456 @@
   // Player 6 cannon
   with TMatter(Matter.AddNew(TMatter.Create)) do begin
-    Kind := mkCannon;
+    Kind := mkTankBody;
     Color := clYellow;
     Player := 5;
@@ -478 +481 @@
   // Player 7 cannon
   with TMatter(Matter.AddNew(TMatter.Create)) do begin
-    Kind := mkCannon;
+    Kind := mkTankBody;
     Color := clYellow;
     Player := 6;
@@ -503 +506 @@
   // Player 8 cannon
   with TMatter(Matter.AddNew(TMatter.Create)) do begin
-    Kind := mkCannon;
+    Kind := mkTankBody;
     Color := clYellow;
     Player := 7;
@@ -674 +677 @@
 
   if Engine.KeyBoard.KeyState[Ord(Keys.Shoot)] then
-    if Bullets.Count < MaxBulletCount then begin
+    if (Bullets.Count < MaxBulletCount) and
+    ((Now - LastShootTime) > ShootDelay * OneSecond) then begin
       NewBullet := TBullet.Create;
       NewBullet.Player := Self;
@@ -683 +687 @@
       NewBullet.StopByDirt := True;
       Bullets.Add(NewBullet);
+      LastShootTime := Now;
+
+      Energy := Energy - ShootEnergyDecrease;
+      if Energy < 0 then Energy := 0;
     end;
 end;
@@ -763 +771 @@
           for P := 0 to Engine.Players.Count - 1 do
           with TPlayer(Engine.Players[P]) do
-          if (TMatter(Engine.World.Matter[ItemsXY[Pos.X, Pos.Y]]).Kind = mkTankBody) and
+          if (Id <> P) and
+            (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;