hedgewars-draft: comparison hedgewars/uAIMisc.pas

equal deleted inserted replaced

-:6ea838b8dcd5
+:13ac59499066
 function  RatePlace(Gear: PGear): LongInt;
 function  TestColl(x, y, r: LongInt): boolean; inline;
 function  TestCollExcludingObjects(x, y, r: LongInt): boolean; inline;
 function  TestCollExcludingMe(Me: PGear; x, y, r: LongInt): boolean; inline;
 function  TraceShoveFall(x, y, dX, dY: Real): LongInt;
-function TestCollWithLand(x, y, r: LongInt): boolean; inline;
 function  RateExplosion(Me: PGear; x, y, r: LongInt): LongInt; inline;
 function  RateExplosion(Me: PGear; x, y, r: LongInt; Flags: LongWord): LongInt;
 function  RateShove(x, y, r, power, kick: LongInt; gdX, gdY: real; Flags: LongWord): LongInt;
 function  RateShotgun(Me: PGear; gdX, gdY: real; x, y: LongInt): LongInt;
 ar: array[0..Pred(MAXBONUS div 8)] of TBonus;  // don't use too many
 end;
 const KillScore = 200;
 var friendlyfactor: LongInt = 300;
+var dmgMod: real = 1.0;
 implementation
 uses uCollisions, uVariables, uUtils, uLandTexture, uGearsUtils;
 var
 KnownExplosion: record
 X, Y, Radius: LongInt
 end = (X: 0; Y: 0; Radius: 0);
 procedure FillTargets;
 if not hasGone then
 begin
 for i:= 0 to cMaxHHIndex do
 if (Hedgehogs[i].Gear <> nil)
 and (Hedgehogs[i].Gear <> ThinkingHH)
 and (Hedgehogs[i].Gear^.Health > Hedgehogs[i].Gear^.Damage)
 then
 begin
 with Targets.ar[Targets.Count], Hedgehogs[i] do
 begin
 skip:= false;
 matters:= (Hedgehogs[i].Gear^.AIHints and aihDoesntMatter) = 0;
 Point.X:= hwRound(Gear^.X);
 Point.Y:= hwRound(Gear^.Y);
 if Clan <> CurrentTeam^.Clan then
 begin
 Score:= Gear^.Health - Gear^.Damage;
 gtCase:
 AddBonus(hwRound(Gear^.X), hwRound(Gear^.Y) + 3, 37, 25);
 gtFlame:
 if (Gear^.State and gsttmpFlag) <> 0 then
 AddBonus(hwRound(Gear^.X), hwRound(Gear^.Y), 20, -50);
 // avoid mines unless they are very likely to be duds, or are duds. also avoid if they are about to blow
 gtMine:
 if ((Gear^.State and gstAttacking) = 0) and (((cMineDudPercent < 90) and (Gear^.Health <> 0))
 or (isAfterAttack and (Gear^.Health = 0) and (Gear^.Damage > 30))) then
 AddBonus(hwRound(Gear^.X), hwRound(Gear^.Y), 50, -50)
 else if (Gear^.State and gstAttacking) <> 0 then
 AddBonus(hwRound(Gear^.X), hwRound(Gear^.Y), 100, -50); // mine is on
 gtExplosives:
 if isAfterAttack then
 AddBonus(hwRound(Gear^.X), hwRound(Gear^.Y), 75, -60 + Gear^.Health);
 gtSMine:
 AddBonus(hwRound(Gear^.X), hwRound(Gear^.Y), 50, -30);
 gtDynamite:
 AddBonus(hwRound(Gear^.X), hwRound(Gear^.Y), 150, -75);
 gtHedgehog:
 begin
 if Gear^.Damage >= Gear^.Health then
 AddBonus(hwRound(Gear^.X), hwRound(Gear^.Y), 60, -25)
 else
 function TestCollWithEverything(x, y, r: LongInt): boolean; inline;
 begin
 if not CheckBounds(x, y, r) then
 exit(false);
 if (Land[y-r, x-r] <> 0) or
 (Land[y+r, x-r] <> 0) or
 (Land[y-r, x+r] <> 0) or
 (Land[y+r, x+r] <> 0) then
 exit(true);
 TestCollWithEverything := false;
 begin
 if not CheckBounds(x, y, r) then
 exit(false);
 if (Land[y-r, x-r] > lfAllObjMask) or
 (Land[y+r, x-r] > lfAllObjMask) or
 (Land[y-r, x+r] > lfAllObjMask) or
 (Land[y+r, x+r] > lfAllObjMask) then
 exit(true);
 TestCollExcludingObjects:= false;
 begin
 if not CheckBounds(x, y, r) then
 exit(false);
 if (Land[y-r, x-r] and lfNotCurrentMask <> 0) or
 (Land[y+r, x-r] and lfNotCurrentMask <> 0) or
 (Land[y-r, x+r] and lfNotCurrentMask <> 0) or
 (Land[y+r, x+r] and lfNotCurrentMask <> 0) then
 exit(true);
 TestColl:= false;
-end;
-function TestCollWithLand(x, y, r: LongInt): boolean; inline;
-begin
-if not CheckBounds(x, y, r) then
-exit(false);
-if (Land[y-r, x-r] > lfAllObjMask) or
-(Land[y+r, x-r] > lfAllObjMask) or
-(Land[y-r, x+r] > lfAllObjMask) or
-(Land[y+r, x+r] > lfAllObjMask) then
-exit(true);
-TestCollWithLand:= false;
 end;
 // Wrapper to test various approaches.  If it works reasonably, will just replace.
 // Right now, converting to hwFloat is a tad inefficient since the x/y were hwFloat to begin with...
 begin
 x:= x + dX;
 y:= y + dY;
 dY:= dY + cGravityf;
 skipLandCheck:= skipLandCheck and (r <> 0) and (abs(eX-x) + abs(eY-y) < r) and ((abs(eX-x) < rCorner) or (abs(eY-y) < rCorner));
-if not skipLandCheck and TestCollWithLand(trunc(x), trunc(y), cHHRadius) then
+if not skipLandCheck and TestCollExcludingObjects(trunc(x), trunc(y), cHHRadius) then
 begin
 if 0.4 < dY then
 begin
 dmg := 1 + trunc((abs(dY) - 0.4) * 70);
 if dmg >= 1 then
 begin
 x:= x + dX;
 y:= y + dY;
 dY:= dY + cGravityf;
 {        if ((trunc(y) and LAND_HEIGHT_MASK) = 0) and ((trunc(x) and LAND_WIDTH_MASK) = 0) then
 begin
 LandPixels[trunc(y), trunc(x)]:= v;
 UpdateLandTexture(trunc(X), 1, trunc(Y), 1, true);
 end;}
 RateExplosion:= RateExplosion(Me, x, y, r, 0);
 end;
 function RateExplosion(Me: PGear; x, y, r: LongInt; Flags: LongWord): LongInt;
 var i, fallDmg, dmg, dmgBase, rate, erasure: LongInt;
-dX, dY, dmgMod: real;
+dX, dY: real;
 hadSkips: boolean;
 begin
 fallDmg:= 0;
-dmgMod:= 0.01 * hwFloat2Float(cDamageModifier) * cDamagePercent;
 rate:= 0;
 // add our virtual position
 with Targets.ar[Targets.Count] do
 begin
 Point.x:= hwRound(Me^.X);
 begin
 if (Flags and afTrackFall <> 0) and (dmg < abs(Score)) then
 begin
 dX:= 0.005 * dmg + 0.01;
 dY:= dX;
 if (x and LAND_WIDTH_MASK = 0) and ((y+cHHRadius+2) and LAND_HEIGHT_MASK = 0) and
 (Land[y+cHHRadius+2, x] and lfIndestructible <> 0) then
 fallDmg:= trunc(TraceFall(x, y, Point.x, Point.y, dX, dY, 0) * dmgMod)
 else fallDmg:= trunc(TraceFall(x, y, Point.x, Point.y, dX, dY, erasure) * dmgMod)
 end;
 if fallDmg < 0 then // drowning. score healthier hogs higher, since their death is more likely to benefit the AI
 RateExplosion:= rate;
 end;
 function RateShove(x, y, r, power, kick: LongInt; gdX, gdY: real; Flags: LongWord): LongInt;
 var i, fallDmg, dmg, rate: LongInt;
-dX, dY, dmgMod: real;
+dX, dY: real;
 begin
 fallDmg:= 0;
 dX:= gdX * 0.01 * kick;
 dY:= gdY * 0.01 * kick;
-dmgMod:= 0.01 * hwFloat2Float(cDamageModifier) * cDamagePercent;
 rate:= 0;
 for i:= 0 to Pred(Targets.Count) do
 with Targets.ar[i] do
 if skip then
 if (Flags and afSetSkip = 0) then skip:= false else {still skip}
 else if matters then
 begin
 dmg:= 0;
 if abs(Point.x - x) + abs(Point.y - y) < r then
 dmg:= r - trunc(sqrt(sqr(Point.x - x)+sqr(Point.y - y)));
 if dmg > 0 then
 begin
 if (Flags and afSetSkip <> 0) then skip:= true;
 if (Flags and afTrackFall <> 0) and (Score > 0) then
 fallDmg:= trunc(TraceShoveFall(Point.x, Point.y - 2, dX, dY) * dmgMod);
 if fallDmg < 0 then // drowning. score healthier hogs higher, since their death is more likely to benefit the AI
 if Score > 0 then
 inc(rate, KillScore + Score div 10)   // Add a bit of a bonus for bigger hog drownings
 else
 RateShove:= rate * 1024
 end;
 function RateShotgun(Me: PGear; gdX, gdY: real; x, y: LongInt): LongInt;
 var i, dmg, fallDmg, baseDmg, rate, erasure: LongInt;
-dX, dY, dmgMod: real;
+dX, dY: real;
 hadSkips: boolean;
 begin
-dmgMod:= 0.01 * hwFloat2Float(cDamageModifier) * cDamagePercent;
 rate:= 0;
 gdX:= gdX * 0.01;
 gdY:= gdX * 0.01;
 // add our virtual position
 with Targets.ar[Targets.Count] do
 begin
 dX:= gdX * dmg;
 dY:= gdY * dmg;
 if dX < 0 then dX:= dX - 0.01
 else dX:= dX + 0.01;
 if (x and LAND_WIDTH_MASK = 0) and ((y+cHHRadius+2) and LAND_HEIGHT_MASK = 0) and
 (Land[y+cHHRadius+2, x] and lfIndestructible <> 0) then
 fallDmg:= trunc(TraceFall(x, y, Point.x, Point.y, dX, dY, 0) * dmgMod)
 else fallDmg:= trunc(TraceFall(x, y, Point.x, Point.y, dX, dY, erasure) * dmgMod);
 if fallDmg < 0 then // drowning. score healthier hogs higher, since their death is more likely to benefit the AI
 if Score > 0 then
 if abs(Point.x - x) + abs(Point.y - y) < 18 then
 begin
 r:= trunc(sqrt(sqr(Point.x - x)+sqr(Point.y - y)));
 if r <= 18 then
 if Score > 0 then
 inc(rate, Score div 3)
 else
 inc(rate, Score div 3 * friendlyfactor div 100)
 end;
 RateHammer:= rate * 1024;
 GoInfo.JumpType:= jmpNone;
 bX:= hwRound(Gear^.X);
 bY:= hwRound(Gear^.Y);
 case JumpType of
 jmpNone: exit(false);
 jmpHJump:
 if TestCollisionYwithGear(Gear, -1) = 0 then
 begin
 Gear^.dY:= -_0_2;
 SetLittle(Gear^.dX);
 Gear^.State:= Gear^.State or gstMoving or gstHHJumping;
 end
 else
 exit(false);
 jmpLJump:
 begin
 if TestCollisionYwithGear(Gear, -1) <> 0 then
 if not TestCollisionXwithXYShift(Gear, _0, -2, hwSign(Gear^.dX)) then
 Gear^.Y:= Gear^.Y - int2hwFloat(2)
 exit(false)
 end
 end;
 repeat
 {if ((hwRound(Gear^.Y) and LAND_HEIGHT_MASK) = 0) and ((hwRound(Gear^.X) and LAND_WIDTH_MASK) = 0) then
 begin
 LandPixels[hwRound(Gear^.Y), hwRound(Gear^.X)]:= Gear^.Hedgehog^.Team^.Clan^.Color;
 UpdateLandTexture(hwRound(Gear^.X), 1, hwRound(Gear^.Y), 1, true);
 end;}
 if not (hwRound(Gear^.Y) + cHHRadius < cWaterLine) then
 exit(false);
 if (Gear^.State and gstMoving) <> 0 then
 begin
 if (GoInfo.Ticks = 350) then
 GoInfo.Ticks:= 0;
 GoInfo.FallPix:= 0;
 GoInfo.JumpType:= jmpNone;
 tY:= hwRound(Gear^.Y);
 repeat
 {if ((hwRound(Gear^.Y) and LAND_HEIGHT_MASK) = 0) and ((hwRound(Gear^.X) and LAND_WIDTH_MASK) = 0) then
 begin
 LandPixels[hwRound(Gear^.Y), hwRound(Gear^.X)]:= random($FFFFFFFF);//Gear^.Hedgehog^.Team^.Clan^.Color;
 UpdateLandTexture(hwRound(Gear^.X), 1, hwRound(Gear^.Y), 1, true);
 end;}
 begin
 if AltGear^.Hedgehog^.BotLevel < 4 then
 AddWalkBonus(pX, tY, 250, -40);
 exit(false)
 end;
 // hog is falling
 if (Gear^.State and gstMoving) <> 0 then
 begin
 inc(GoInfo.Ticks);
 Gear^.dY:= Gear^.dY + cGravity;
 if Gear^.dY > _0_4 then
 begin
 GoInfo.FallPix:= 0;
 // try ljump instead of fall with damage
 HHJump(AltGear, jmpLJump, GoInfo);
 if AltGear^.Hedgehog^.BotLevel < 4 then
 AddWalkBonus(pX, tY, 175, -20);
 exit(false)
 end;
 Gear^.Y:= Gear^.Y + Gear^.dY;

branch	0.9.19
changeset 8924	13ac59499066
parent 8895	95177c18e38c
child 8939	b26aaf28c920