Changeset 13 for trunk/UCore.pas

Timestamp:

Mar 22, 2011, 5:24:11 PM (14 years ago)

Author:

george

Message:

• Fixed: Tank explosion effect.

File:

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

trunk/UCore.pas

@@ -11 +11 @@
 const
   MaxBulletCount = 10;
-  EnergySteps = 40;
-  ShieldSteps = 40;
-  ExplosionBulletCount = 200;
-  ExplosionRange = 15;
+  EnergySteps = 400;
+  ShieldSteps = 400;
+  ExplosionBulletCount = 100;
+  ExplosionRange = 20;
+  ExplosionBulletMaxSpeed = 0.5;
+  ExplosionBulletMinSpeed = 0.2;
 
 type
@@ -35 +37 @@
     Shoot: Word;
   end;
+
+  { TBullet }
 
   TBullet = class
@@ -43 +47 @@
     Distance: Real;
     StopByDirt: Boolean;
+    constructor Create;
   end;
 
@@ -163 +168 @@
 end;
 
+{ TBullet }
+
+constructor TBullet.Create;
+begin
+  MaxDistance := -1;
+  Distance := 0;
+end;
+
 { TTank }
 
@@ -352 +365 @@
   I: Integer;
   Pos: TPoint;
-begin
+  D: Real;
+begin
+  // Check energy
+  if not Engine.IsInsideHouses(Position) then begin
+    Energy := Energy - 1 / EnergySteps;
+    if Energy <= 0 then begin
+      Energy := 0;
+      Explosion;
+    end;
+  end else begin
+    Energy := Energy + 5 * 1 / EnergySteps;
+    if Energy > 1 then Energy := 1;
+  end;
+  if LastEnergy <> Energy then begin
+    LastEnergy := Energy;
+    Engine.Redraw;
+  end;
+
+  // Bullet movement
   for I := Bullets.Count - 1 downto 0 do
   with TBullet(Bullets[I]) do begin
@@ -362 +393 @@
     Distance := Distance + Sqrt(Sqr(Direction.X) + Sqr(Direction.Y));
     //ShowMessage(FloatToStr(Distance));
-    if (Distance > MaxDistance) and (MaxDistance > 0) then begin
+    if (Distance > MaxDistance) and (MaxDistance >= 0) then begin
       Bullets.Delete(I);
+      Engine.Redraw;
       Continue;
     end;
@@ -369 +401 @@
     Pos := Point(Trunc(Position.X), Trunc(Position.Y));
 
-    if Engine.World.Surface.ItemsXY[Pos.X, Pos.Y] <> Byte(smNothing) then begin
+    if (Engine.World.Surface.ItemsXY[Pos.X, Pos.Y] <> Byte(smNothing)) and
+    (Engine.World.Surface.ItemsXY[Pos.X, Pos.Y] <> Byte(smBullet)) then begin
       if (Engine.World.Surface.ItemsXY[Pos.X, Pos.Y] = Byte(smDirt1)) or
         (Engine.World.Surface.ItemsXY[Pos.X, Pos.Y] = Byte(smDirt2)) then begin
@@ -393 +426 @@
       end;
     Engine.World.Surface.ItemsXY[Pos.X, Pos.Y] := Byte(smBullet);
-    Engine.Redraw;
-  end;
-
-  if not Engine.IsInsideHouses(Position) then begin
-    Energy := Energy - 1 / EnergySteps;
-    if Energy <= 0 then begin
-      Energy := 0;
-      Explosion;
-    end;
-  end else begin
-    Energy := Energy + 5 * 1 / EnergySteps;
-    if Energy > 1 then Energy := 1;
-  end;
-  if LastEnergy <> Energy then begin
-    LastEnergy := Energy;
     Engine.Redraw;
   end;
@@ -521 +539 @@
   NewBullet: TBullet;
   I: Integer;
-const
-  BulletMaxSpeed = 1;
-  BulletMinSpeed = 0.5;
+  Speed: Real;
+  Angle: Real;
 begin
   if not Exploded then begin
@@ -531 +548 @@
       NewBullet := TBullet.Create;
       NewBullet.Player := Self;
-      NewBullet.Direction.X := (BulletMaxSpeed - BulletMinSpeed) * (Random - 0.5);
-      NewBullet.Direction.Y := (BulletMaxSpeed - BulletMinSpeed) * (Random - 0.5);
-      //NewBullet.Direction.X := NewBullet.Direction.X + BulletMinSpeed * Sign(NewBullet.Direction.X);
-      //NewBullet.Direction.Y := NewBullet.Direction.Y + BulletMinSpeed * Sign(NewBullet.Direction.Y);
-      NewBullet.Position.X := Position.X + NewBullet.Direction.X * 2;
-      NewBullet.Position.Y := Position.Y + NewBullet.Direction.Y * 2;
-(*      if NewBullet.Direction.X < (Speed / 10) then
-        NewBullet.Direction.X := Speed / 10;
-      if NewBullet.Direction.Y < (Speed / 10) then
-        NewBullet.Direction.Y := Speed / 10;*)
+      Speed := ExplosionBulletMinSpeed + (ExplosionBulletMaxSpeed - ExplosionBulletMinSpeed) * Random;
+      Angle := Random * 2 * Pi;
+      NewBullet.Direction.X := Sin(Angle) * Speed;
+      NewBullet.Direction.Y := Cos(Angle) * Speed;
+      NewBullet.Position.X := Position.X + NewBullet.Direction.X * 3;
+      NewBullet.Position.Y := Position.Y + NewBullet.Direction.Y * 3;
       NewBullet.MaxDistance := Random(ExplosionRange);
       Bullets.Add(NewBullet);