hedgewars: comparison hedgewars/uAIAmmoTests.pas

equal deleted inserted replaced

-:785c1af0bf87
+:e933b1dc302d
 const cShift = 4;
 Density : real = 2.0;
 var bombsSpeed, X, Y, dX, dY: real;
 b: array[0..9] of boolean;
 dmg: array[0..9] of LongInt;
-fexit: boolean;
+fexit, firstHit: boolean;
-i, t, valueResult: LongInt;
+i, t, valueResult, targetY: LongInt;
 begin
 Flags:= Flags; // avoid compiler hint
 ap.ExplR:= 0;
 ap.Time:= 0;
 if (Level > 3) or (cGravityf = 0) then
 begin
 b[i]:= true;
 dmg[i]:= 0
 end;
 valueResult:= 0;
+firstHit:= false;
 repeat
 X:= X + dX;
 if (GameFlags and gfMoreWind) <> 0 then
 dX:= dX + windSpeed / Density;
 begin
 fexit:= false;
 if TestColl(trunc(X) + LongWord(i * 30), trunc(Y), 4) then
 begin
 b[i]:= false;
-dmg[i]:= RateExplosion(Me, trunc(X) + LongWord(i * 30), trunc(Y), 58)
+dmg[i]:= RateExplosion(Me, trunc(X) + LongWord(i * 30), trunc(Y), 58);
 // 58 (instead of 60) for better prediction (hh moves after explosion of one of the rockets)
+if (not firstHit) then
+begin
+firstHit:= true;
+// remember Y of first hit, used for target pos
+targetY:= trunc(Y);
+end;
 end
 end;
 until fexit or (Y > cWaterLine);
 for i:= 0 to 5 do
 if dmg[i] <> BadTurn then
 inc(valueResult, dmg[i]);
 t:= valueResult;
 ap.AttackPutX:= Targ.Point.X - 60;
+if firstHit then
+// this is not strictly neccessry, it's just to make sure
+// the X is on the height of the first hit
+ap.AttackPutY:= targetY;
 for i:= 0 to 3 do
 if dmg[i] <> BadTurn then
 begin
 dec(t, dmg[i]);
 const cShift = 4;
 Density : real = 1.0;
 var bombsSpeed, X, Y, dX, dY, drillX, drillY: real;
 t2: real;
 dmg: array[0..9] of LongInt;
-collided, drilling, timerRuns: boolean;
+collided, drilling, timerRuns, firstHit: boolean;
-i, t, value, valueResult, attackTime, drillTimer, targetX: LongInt;
+i, t, value, valueResult, attackTime, drillTimer, targetX, targetY: LongInt;
 begin
 Flags:= Flags; // avoid compiler hint
 ap.ExplR:= 0;
 if (Level > 3) or (cGravityf = 0) then
 exit(BadTurn);
 attackTime:= 6000;
 while attackTime >= 0 do
 begin
 dec(attackTime, 1000);
 value:= 0;
+firstHit:= false;
 for i:= 0 to 9 do
 begin
 dmg[i]:= 0;
 drillX:= trunc(X) + LongWord(i * 30);
 drillY:= trunc(Y);
 else if (drillTimer <= 0) or TestColl(trunc(drillX), trunc(drillY), 4) then
 collided:= true;
 // Simulate explosion
 if collided then
+begin
 dmg[i]:= RateExplosion(Me, trunc(drillX), trunc(drillY), 58);
 // 58 (instead of 60) for better prediction (hh moves after explosion of one of the rockets)
+if not firstHit then
+begin
+targetY:= trunc(drillY);
+firstHit:= true;
+end;
+end;
 until collided or (drillY > cWaterLine);
 end;
 // calculate score
 for i:= 0 to 5 do
 if value > valueResult then
 begin
 valueResult:= value;
 ap.AttackPutX:= targetX;
+if firstHit then
+ap.AttackPutY:= targetY;
 ap.Time:= attackTime;
 end;
 end;
 if valueResult <= 0 then
 const cShift = 4;
 Density : real = 1.0;
 var minesSpeed, X, Y, dX, dY: real;
 b: array[0..9] of boolean;
 dmg: array[0..9] of LongInt;
-fexit: boolean;
+fexit, firstHit: boolean;
-i, t, valueResult: LongInt;
+i, t, valueResult, targetY: LongInt;
 begin
 Flags:= Flags; // avoid compiler hint
 ap.ExplR:= 0;
 ap.Time:= 0;
 begin
 b[i]:= true;
 dmg[i]:= 0
 end;
 valueResult:= 0;
+firstHit:= false;
 repeat
 X:= X + dX;
 if (GameFlags and (gfMoreWind or gfInfAttack)) <> 0 then
 dX:= dX + windSpeed / Density;
 begin
 fexit:= false;
 if TestColl(trunc(X) + LongWord(i * 30), trunc(Y), 4) then
 begin
 b[i]:= false;
-dmg[i]:= RateExplosion(Me, trunc(X) + LongWord(i * 30), trunc(Y), 96)
+dmg[i]:= RateExplosion(Me, trunc(X) + LongWord(i * 30), trunc(Y), 96);
+if (not firstHit) then
+begin
+targetY:= trunc(Y);
+firstHit:= true;
+end;
 end
 end;
 until fexit or (Y > cWaterLine);
 for i:= 0 to 5 do
 if dmg[i] <> BadTurn then
 inc(valueResult, dmg[i]);
 t:= valueResult;
 ap.AttackPutX:= Targ.Point.X - 60;
+if firstHit then
+ap.AttackPutY:= targetY;
 for i:= 0 to 3 do
 if dmg[i] <> BadTurn then
 begin
 dec(t, dmg[i]);
 function TestPiano(Me: PGear; Targ: TTarget; Level: LongInt; var ap: TAttackParams; Flags: LongWord): LongInt;
 const BOUNCES = 5;
 var X, Y: real;
 dmg: array[0..BOUNCES-1] of LongInt;
-i, e, rate, valueResult: LongInt;
+i, e, rate, valueResult, targetY: LongInt;
+firstHit: boolean;
 begin
 Flags:= Flags; // avoid compiler hint
 ap.ExplR:= 0;
 ap.Time:= 0;
 if (cGravityf <= 0) then
 for i:= 0 to BOUNCES-1 do
 dmg[i]:= 0;
 i:= 1;
+firstHit:= false;
 repeat
 // Piano goes down
 Y:= Y + 11;
 if TestCollExcludingMe(Me^.Hedgehog^.Gear, trunc(X), trunc(Y), 32) then
 begin
+if (not firstHit) then
+targetY:= trunc(Y);
+firstHit:= true;
 for e:= -1 to 1 do
 begin
 rate:= RateExplosion(Me, trunc(X) + 30*e, trunc(Y)+40, 161, afIgnoreMe);
 if rate <> BadTurn then
 dmg[i]:= dmg[i] + rate;
 break;
 end
 else
 inc(valueResult, dmg[i]);
 ap.AttackPutX:= Targ.Point.X;
+if firstHit then
+ap.AttackPutY:= targetY;
 valueResult:= valueResult - KillScore * friendlyfactor div 100 * 1024;
 if valueResult <= 0 then
 valueResult:= BadTurn;

changeset 15678	e933b1dc302d
parent 15676	6de74494b8a5
child 15679	b64f96d43f1f