--- a/hedgewars/uAIAmmoTests.pas	Tue Jun 20 20:08:17 2006 +0000
+++ b/hedgewars/uAIAmmoTests.pas	Tue Jun 20 21:18:49 2006 +0000
@@ -1,19 +1,34 @@
 unit uAIAmmoTests;
 interface
-uses SDLh;
+uses SDLh, uGears, uConsts;
+
+function TestBazooka(Me: PGear; Targ: TPoint; out Time: Longword; out Angle, Power: integer): integer;
+function TestGrenade(Me: PGear; Targ: TPoint; out Time: Longword; out Angle, Power: integer): integer;
 
-function TestBazooka(Me, Targ: TPoint; out Time: Longword; out Angle, Power: integer): integer;
+type TAmmoTestProc = function (Me: PGear; Targ: TPoint; out Time: Longword; out Angle, Power: integer): integer;
+const AmmoTests: array[TAmmoType] of TAmmoTestProc =
+                 (
+{amGrenade}       TestGrenade,
+{amBazooka}       TestBazooka,
+{amUFO}           nil,
+{amShotgun}       nil,
+{amPickHammer}    nil,
+{amSkip}          nil,
+{amRope}          nil,
+{amMine}          nil,
+{amDEagle}        nil,
+{amDynamite}      nil
+                  );
 
 implementation
 uses uMisc, uAIMisc;
-const cMyHHDamageScore = -3000;
 
 function Metric(x1, y1, x2, y2: integer): integer;
 begin
 Result:= abs(x1 - x2) + abs(y1 - y2)
 end;
 
-function TestBazooka(Me, Targ: TPoint; out Time: Longword; out Angle, Power: integer): integer;
+function TestBazooka(Me: PGear; Targ: TPoint; out Time: Longword; out Angle, Power: integer): integer;
 var Vx, Vy, r: real;
     rTime: real;
     Score: integer;
@@ -34,9 +49,7 @@
       dY:= dY + cGravity;
       dec(t)
     until TestColl(round(x), round(y), 5) or (t <= 0);
-    if NoMyHHNear(round(x), round(y), 110) then
-         Result:= - Metric(round(x), round(y), Targ.x, Targ.y) div 16
-    else Result:= cMyHHDamageScore;
+    Result:= RateExplosion(Me, round(x), round(y), 101) - Metric(Targ.X, Targ.Y, round(x), round(y)) div 16
     end;
 
 begin
@@ -44,7 +57,7 @@
 rTime:= 10;
 Result:= Low(integer);
 repeat
-  rTime:= rTime + 70 + random*200;
+  rTime:= rTime + 100 + random*250;
   Vx:= - cWindSpeed * rTime / 2 + (Targ.X - Me.X) / rTime;
   Vy:= cGravity * rTime / 2 - (Targ.Y - Me.Y) / rTime;
   r:= sqr(Vx) + sqr(Vy);
@@ -62,4 +75,51 @@
 until (rTime >= 5000)
 end;
 
+function TestGrenade(Me: PGear; Targ: TPoint; out Time: Longword; out Angle, Power: integer): integer;
+const tDelta = 10;
+var Vx, Vy, r: real;
+    Score: integer;
+    TestTime: Longword;
+
+    function CheckTrace: integer;
+    var x, y, dY: real;
+        t: integer;
+    begin
+    x:= Me.X;
+    y:= Me.Y;
+    dY:= -Vy;
+    t:= TestTime;
+    repeat
+      x:= x + Vx;
+      y:= y + dY;
+      dY:= dY + cGravity;
+      dec(t)
+    until TestColl(round(x), round(y), 5) or (t = 0);
+    if t < 50 then Result:= RateExplosion(Me, round(x), round(y), 101)
+              else Result:= Low(integer)
+    end;
+
+begin
+Result:= Low(integer);
+TestTime:= 0;
+repeat
+  inc(TestTime, 1000);
+  Vx:= (Targ.X - Me.X) / (TestTime + tDelta);
+  Vy:= cGravity*((TestTime + tDelta) div 2) - (Targ.Y - Me.Y) / (TestTime + tDelta);
+  r:= sqr(Vx) + sqr(Vy);
+  if r <= 1 then
+     begin
+     Score:= CheckTrace;
+     if Result <= Score then
+        begin
+        r:= sqrt(r);
+        Angle:= DxDy2AttackAngle(Vx, Vy);
+        Power:= round(r * cMaxPower);
+        Time:= TestTime;
+        Result:= Score
+        end;
+     end
+until (TestTime = 5000)
+end;
+
 end.