diff -r fe71e55d2d7b -r 2aed85310727 hedgewars/uAIMisc.pas --- a/hedgewars/uAIMisc.pas Fri Jan 26 18:39:40 2007 +0000 +++ b/hedgewars/uAIMisc.pas Fri Jan 26 22:36:21 2007 +0000 @@ -20,7 +20,7 @@ interface uses SDLh, uConsts, uGears, uFloat; {$INCLUDE options.inc} - { + type TTarget = record Point: TPoint; Score: integer; @@ -43,17 +43,17 @@ function TestColl(x, y, r: integer): boolean; function RateExplosion(Me: PGear; x, y, r: integer): integer; function RateShove(Me: PGear; x, y, r, power: integer): integer; -function HHGo(Gear, AltGear: PGear; out GoInfo: TGoInfo): boolean; -function rndSign(num: integer): integer; +function HHGo(Gear, AltGear: PGear; var GoInfo: TGoInfo): boolean; +//function rndSign(num: integer): integer; var ThinkingHH: PGear; Targets: TTargets; - } + implementation -{uses uTeams, uMisc, uLand, uCollisions; +uses uTeams, uMisc, uLand, uCollisions; const KillScore = 200; MAXBONUS = 1024; - + type TBonus = record X, Y: integer; Radius: integer; @@ -76,19 +76,19 @@ while t <> nil do begin for i:= 0 to cMaxHHIndex do - if (t.Hedgehogs[i].Gear <> nil) - and (t.Hedgehogs[i].Gear <> ThinkingHH) then + if (t^.Hedgehogs[i].Gear <> nil) + and (t^.Hedgehogs[i].Gear <> ThinkingHH) then begin - with Targets.ar[Targets.Count], t.Hedgehogs[i] do + with Targets.ar[Targets.Count], t^.Hedgehogs[i] do begin - Point.X:= Round(Gear.X); - Point.Y:= Round(Gear.Y); - if t.Color <> CurrentTeam.Color then Score:= Gear.Health - else Score:= -Gear.Health + Point.X:= hwRound(Gear^.X); + Point.Y:= hwRound(Gear^.Y); + if t^.Color <> CurrentTeam^.Color then Score:= Gear^.Health + else Score:= -Gear^.Health end; inc(Targets.Count) end; - t:= t.Next + t:= t^.Next end end; @@ -108,23 +108,23 @@ begin bonuses.Count:= 0; -MyColor:= PHedgehog(ThinkingHH.Hedgehog).Team.Color; +MyColor:= PHedgehog(ThinkingHH^.Hedgehog)^.Team^.Color; Gear:= GearsList; while Gear <> nil do begin - case Gear.Kind of - gtCase: AddBonus(round(Gear.X), round(Gear.Y), 33, 25); - gtMine: if (Gear.State and gstAttacking) = 0 then AddBonus(round(Gear.X), round(Gear.Y), 50, -50) - else AddBonus(round(Gear.X), round(Gear.Y), 100, -50); // mine is on - gtDynamite: AddBonus(round(Gear.X), round(Gear.Y), 150, -75); + case Gear^.Kind of + gtCase: AddBonus(hwRound(Gear^.X), hwRound(Gear^.Y), 33, 25); + gtMine: if (Gear^.State and gstAttacking) = 0 then AddBonus(hwRound(Gear^.X), hwRound(Gear^.Y), 50, -50) + else AddBonus(hwRound(Gear^.X), hwRound(Gear^.Y), 100, -50); // mine is on + gtDynamite: AddBonus(hwRound(Gear^.X), hwRound(Gear^.Y), 150, -75); gtHedgehog: begin - if Gear.Damage >= Gear.Health then AddBonus(round(Gear.X), round(Gear.Y), 60, -25) else - if isAfterAttack and (ThinkingHH.Hedgehog <> Gear.Hedgehog) then - if (MyColor = PHedgehog(Gear.Hedgehog).Team.Color) then AddBonus(round(Gear.X), round(Gear.Y), 150, -3) // hedgehog-friend - else AddBonus(round(Gear.X), round(Gear.Y), 100, 3) + if Gear^.Damage >= Gear^.Health then AddBonus(hwRound(Gear^.X), hwRound(Gear^.Y), 60, -25) else + if isAfterAttack and (ThinkingHH^.Hedgehog <> Gear^.Hedgehog) then + if (MyColor = PHedgehog(Gear^.Hedgehog)^.Team^.Color) then AddBonus(hwRound(Gear^.X), hwRound(Gear^.Y), 150, -3) // hedgehog-friend + else AddBonus(hwRound(Gear^.X), hwRound(Gear^.Y), 100, 3) end; end; - Gear:= Gear.NextGear + Gear:= Gear^.NextGear end; if isAfterAttack and (KnownExplosion.Radius > 0) then with KnownExplosion do @@ -140,44 +140,47 @@ function RatePlace(Gear: PGear): integer; var i, r: integer; + Result: integer; begin Result:= 0; for i:= 0 to Pred(bonuses.Count) do with bonuses.ar[i] do begin - r:= round(sqrt(sqr(Gear.X - X) + sqr(Gear.Y - y))); + r:= hwRound(Distance(Gear^.X - X, Gear^.Y - y)); if r < Radius then inc(Result, Score * (Radius - r)) end; + RatePlace:= Result end; function TestColl(x, y, r: integer): boolean; +var b: boolean; begin -Result:=(((x-r) and $FFFFF800) = 0)and(((y-r) and $FFFFFC00) = 0) and (Land[y-r, x-r] <> 0); -if Result then exit; -Result:=(((x-r) and $FFFFF800) = 0)and(((y+r) and $FFFFFC00) = 0) and (Land[y+r, x-r] <> 0); -if Result then exit; -Result:=(((x+r) and $FFFFF800) = 0)and(((y-r) and $FFFFFC00) = 0) and (Land[y-r, x+r] <> 0); -if Result then exit; -Result:=(((x+r) and $FFFFF800) = 0)and(((y+r) and $FFFFFC00) = 0) and (Land[y+r, x+r] <> 0); +b:= (((x-r) and $FFFFF800) = 0)and(((y-r) and $FFFFFC00) = 0) and (Land[y-r, x-r] <> 0); +if b then exit(true); +b:=(((x-r) and $FFFFF800) = 0)and(((y+r) and $FFFFFC00) = 0) and (Land[y+r, x-r] <> 0); +if b then exit(true); +b:=(((x+r) and $FFFFF800) = 0)and(((y-r) and $FFFFFC00) = 0) and (Land[y-r, x+r] <> 0); +if b then exit(true); +TestColl:=(((x+r) and $FFFFF800) = 0)and(((y+r) and $FFFFFC00) = 0) and (Land[y+r, x+r] <> 0) end; function RateExplosion(Me: PGear; x, y, r: integer): integer; -var i, dmg: integer; +var i, dmg, Result: integer; begin Result:= 0; // add our virtual position with Targets.ar[Targets.Count] do begin - Point.x:= round(Me.X); - Point.y:= round(Me.Y); - Score:= - ThinkingHH.Health + Point.x:= hwRound(Me^.X); + Point.y:= hwRound(Me^.Y); + Score:= - ThinkingHH^.Health end; // rate explosion for i:= 0 to Targets.Count do with Targets.ar[i] do begin - dmg:= r - Round(sqrt(sqr(Point.x - x) + sqr(Point.y - y))); + dmg:= r - hwRound(Distance(Point.x - x, Point.y - y)); if dmg > 0 then begin dmg:= dmg shr 1; @@ -189,17 +192,17 @@ else dec(Result, dmg * 3) end; end; -Result:= Result * 1024 +RateExplosion:= Result * 1024 end; function RateShove(Me: PGear; x, y, r, power: integer): integer; -var i, dmg: integer; +var i, dmg, Result: integer; begin Result:= 0; for i:= 0 to Targets.Count do with Targets.ar[i] do begin - dmg:= r - Round(sqrt(sqr(Point.x - x) + sqr(Point.y - y))); + dmg:= r - hwRound(Distance(Point.x - x, Point.y - y)); if dmg > 0 then begin if power > abs(Score) then @@ -210,84 +213,85 @@ else dec(Result, power * 3) end; end; -Result:= Result * 1024 +RateShove:= Result * 1024 end; -function HHJump(Gear: PGear; JumpType: TJumpType; out GoInfo: TGoInfo): boolean; +function HHJump(Gear: PGear; JumpType: TJumpType; var GoInfo: TGoInfo): boolean; var bX, bY: integer; + Result: boolean; begin Result:= false; GoInfo.Ticks:= 0; GoInfo.FallPix:= 0; GoInfo.JumpType:= jmpNone; -bX:= round(Gear.X); -bY:= round(Gear.Y); +bX:= hwRound(Gear^.X); +bY:= hwRound(Gear^.Y); case JumpType of - jmpNone: exit; + jmpNone: exit(Result); jmpHJump: if not TestCollisionYwithGear(Gear, -1) then begin - Gear.dY:= -0.20; - Gear.dX:= 0.0000001 * hwSign(Gear.dX); - Gear.X:= Gear.X - hwSign(Gear.dX)*0.00008; // shift compensation - Gear.State:= Gear.State or gstFalling or gstHHJumping; - end else exit; + Gear^.dY:= -_0_2; + SetLittle(Gear^.dX); + Gear^.State:= Gear^.State or gstFalling or gstHHJumping; + end else exit(Result); jmpLJump: begin if not TestCollisionYwithGear(Gear, -1) then - if not TestCollisionXwithXYShift(Gear, 0, -2, hwSign(Gear.dX)) then Gear.Y:= Gear.Y - 2 else - if not TestCollisionXwithXYShift(Gear, 0, -1, hwSign(Gear.dX)) then Gear.Y:= Gear.Y - 1; - if not (TestCollisionXwithGear(Gear, hwSign(Gear.dX)) + if not TestCollisionXwithXYShift(Gear, 0, -2, hwSign(Gear^.dX)) then Gear^.Y:= Gear^.Y - 2 else + if not TestCollisionXwithXYShift(Gear, 0, -1, hwSign(Gear^.dX)) then Gear^.Y:= Gear^.Y - 1; + if not (TestCollisionXwithGear(Gear, hwSign(Gear^.dX)) or TestCollisionYwithGear(Gear, -1)) then begin - Gear.dY:= -0.15; - Gear.dX:= hwSign(Gear.dX) * 0.15; - Gear.State:= Gear.State or gstFalling or gstHHJumping - end else exit + Gear^.dY:= _0_15; + Gear^.dX:= hwSign(Gear^.dX) * _0_15; + Gear^.State:= Gear^.State or gstFalling or gstHHJumping + end else exit(Result) end end; repeat -if Gear.Y + cHHRadius >= cWaterLine then exit; -if (Gear.State and gstFalling) <> 0 then +if not (Gear^.Y + cHHRadius < cWaterLine) then exit(Result); +if (Gear^.State and gstFalling) <> 0 then begin if (GoInfo.Ticks = 350) then - if (abs(Gear.dX) < 0.0000002) and (Gear.dY < -0.02) then + if (hwAbs(Gear^.dX) < cLittle + cLittle) and (Gear^.dY < -_0_02) then begin - Gear.dY:= -0.25; - Gear.dX:= hwSign(Gear.dX) * 0.02 + Gear^.dY:= -_0_25; + Gear^.dX:= hwSign(Gear^.dX) * _0_02 end; - if TestCollisionXwithGear(Gear, hwSign(Gear.dX)) then Gear.dX:= 0.0000001 * hwSign(Gear.dX); - Gear.X:= Gear.X + Gear.dX; + if TestCollisionXwithGear(Gear, hwSign(Gear^.dX)) then SetLittle(Gear^.dX); + Gear^.X:= Gear^.X + Gear^.dX; inc(GoInfo.Ticks); - Gear.dY:= Gear.dY + cGravity; - if Gear.dY > 0.40 then exit; - if (Gear.dY < 0)and TestCollisionYwithGear(Gear, -1) then Gear.dY:= 0; - Gear.Y:= Gear.Y + Gear.dY; - if (Gear.dY >= 0)and TestCollisionYwithGear(Gear, 1) then + Gear^.dY:= Gear^.dY + cGravity; + if Gear^.dY > _0_4 then exit(Result); + if (Gear^.dY.isNegative)and TestCollisionYwithGear(Gear, -1) then Gear^.dY:= 0; + Gear^.Y:= Gear^.Y + Gear^.dY; + if (not Gear^.dY.isNegative)and TestCollisionYwithGear(Gear, 1) then begin - Gear.State:= Gear.State and not (gstFalling or gstHHJumping); - Gear.dY:= 0; + Gear^.State:= Gear^.State and not (gstFalling or gstHHJumping); + Gear^.dY:= 0; case JumpType of - jmpHJump: if (bY - Gear.Y > 5) then + jmpHJump: if (bY - Gear^.Y > 5) then begin Result:= true; GoInfo.JumpType:= jmpHJump; inc(GoInfo.Ticks, 300 + 300) // 300 before jump, 300 after end; - jmpLJump: if abs(bX - Gear.X) > 30 then + jmpLJump: if hwAbs(bX - Gear^.X) > 30 then begin Result:= true; GoInfo.JumpType:= jmpLJump; inc(GoInfo.Ticks, 300 + 300) // 300 before jump, 300 after end; end; - exit + exit(Result) end; end; -until false; +until false end; -function HHGo(Gear, AltGear: PGear; out GoInfo: TGoInfo): boolean; +function HHGo(Gear, AltGear: PGear; var GoInfo: TGoInfo): boolean; var pX, pY: integer; + Result: boolean; begin Result:= false; AltGear^:= Gear^; @@ -296,79 +300,78 @@ GoInfo.FallPix:= 0; GoInfo.JumpType:= jmpNone; repeat -pX:= round(Gear.X); -pY:= round(Gear.Y); +pX:= hwRound(Gear^.X); +pY:= hwRound(Gear^.Y); if pY + cHHRadius >= cWaterLine then exit; -if (Gear.State and gstFalling) <> 0 then +if (Gear^.State and gstFalling) <> 0 then begin inc(GoInfo.Ticks); - Gear.dY:= Gear.dY + cGravity; - if Gear.dY > 0.40 then + Gear^.dY:= Gear^.dY + cGravity; + if Gear^.dY > _0_4 then begin Goinfo.FallPix:= 0; HHJump(AltGear, jmpLJump, GoInfo); // try ljump enstead of fall with damage - exit + exit(Result) end; - Gear.Y:= Gear.Y + Gear.dY; - if round(Gear.Y) > pY then inc(GoInfo.FallPix); + Gear^.Y:= Gear^.Y + Gear^.dY; + if hwRound(Gear^.Y) > pY then inc(GoInfo.FallPix); if TestCollisionYwithGear(Gear, 1) then begin inc(GoInfo.Ticks, 300); - Gear.State:= Gear.State and not (gstFalling or gstHHJumping); - Gear.dY:= 0; + Gear^.State:= Gear^.State and not (gstFalling or gstHHJumping); + Gear^.dY:= 0; Result:= true; HHJump(AltGear, jmpLJump, GoInfo); // try ljump instead of fall - exit + exit(Result) end; continue end; - if (Gear.Message and gm_Left )<>0 then Gear.dX:= -1.0 else - if (Gear.Message and gm_Right )<>0 then Gear.dX:= 1.0 else exit; - if TestCollisionXwithGear(Gear, hwSign(Gear.dX)) then + if (Gear^.Message and gm_Left )<>0 then Gear^.dX:= -cLittle else + if (Gear^.Message and gm_Right )<>0 then Gear^.dX:= cLittle else exit(Result); + if TestCollisionXwithGear(Gear, hwSign(Gear^.dX)) then begin - if not (TestCollisionXwithXYShift(Gear, 0, -6, hwSign(Gear.dX)) - or TestCollisionYwithGear(Gear, -1)) then Gear.Y:= Gear.Y - 1; - if not (TestCollisionXwithXYShift(Gear, 0, -5, hwSign(Gear.dX)) - or TestCollisionYwithGear(Gear, -1)) then Gear.Y:= Gear.Y - 1; - if not (TestCollisionXwithXYShift(Gear, 0, -4, hwSign(Gear.dX)) - or TestCollisionYwithGear(Gear, -1)) then Gear.Y:= Gear.Y - 1; - if not (TestCollisionXwithXYShift(Gear, 0, -3, hwSign(Gear.dX)) - or TestCollisionYwithGear(Gear, -1)) then Gear.Y:= Gear.Y - 1; - if not (TestCollisionXwithXYShift(Gear, 0, -2, hwSign(Gear.dX)) - or TestCollisionYwithGear(Gear, -1)) then Gear.Y:= Gear.Y - 1; - if not (TestCollisionXwithXYShift(Gear, 0, -1, hwSign(Gear.dX)) - or TestCollisionYwithGear(Gear, -1)) then Gear.Y:= Gear.Y - 1; + if not (TestCollisionXwithXYShift(Gear, 0, -6, hwSign(Gear^.dX)) + or TestCollisionYwithGear(Gear, -1)) then Gear^.Y:= Gear^.Y - 1; + if not (TestCollisionXwithXYShift(Gear, 0, -5, hwSign(Gear^.dX)) + or TestCollisionYwithGear(Gear, -1)) then Gear^.Y:= Gear^.Y - 1; + if not (TestCollisionXwithXYShift(Gear, 0, -4, hwSign(Gear^.dX)) + or TestCollisionYwithGear(Gear, -1)) then Gear^.Y:= Gear^.Y - 1; + if not (TestCollisionXwithXYShift(Gear, 0, -3, hwSign(Gear^.dX)) + or TestCollisionYwithGear(Gear, -1)) then Gear^.Y:= Gear^.Y - 1; + if not (TestCollisionXwithXYShift(Gear, 0, -2, hwSign(Gear^.dX)) + or TestCollisionYwithGear(Gear, -1)) then Gear^.Y:= Gear^.Y - 1; + if not (TestCollisionXwithXYShift(Gear, 0, -1, hwSign(Gear^.dX)) + or TestCollisionYwithGear(Gear, -1)) then Gear^.Y:= Gear^.Y - 1; end; - if not TestCollisionXwithGear(Gear, hwSign(Gear.dX)) then + if not TestCollisionXwithGear(Gear, hwSign(Gear^.dX)) then begin - Gear.X:= Gear.X + Gear.dX; + Gear^.X:= Gear^.X + Gear^.dX; inc(GoInfo.Ticks, cHHStepTicks) end; if not TestCollisionYwithGear(Gear, 1) then begin - Gear.Y:= Gear.Y + 1; + Gear^.Y:= Gear^.Y + 1; if not TestCollisionYwithGear(Gear, 1) then begin - Gear.Y:= Gear.Y + 1; + Gear^.Y:= Gear^.Y + 1; if not TestCollisionYwithGear(Gear, 1) then begin - Gear.Y:= Gear.Y + 1; + Gear^.Y:= Gear^.Y + 1; if not TestCollisionYwithGear(Gear, 1) then begin - Gear.Y:= Gear.Y + 1; + Gear^.Y:= Gear^.Y + 1; if not TestCollisionYwithGear(Gear, 1) then begin - Gear.Y:= Gear.Y + 1; + Gear^.Y:= Gear^.Y + 1; if not TestCollisionYwithGear(Gear, 1) then begin - Gear.Y:= Gear.Y + 1; + Gear^.Y:= Gear^.Y + 1; if not TestCollisionYwithGear(Gear, 1) then begin - Gear.Y:= Gear.Y - 6; - Gear.dY:= 0; - Gear.dX:= 0.0000001 * hwSign(Gear.dX); - Gear.State:= Gear.State or gstFalling + Gear^.Y:= Gear^.Y - 6; + Gear^.dY:= 0; + Gear^.State:= Gear^.State or gstFalling end end end @@ -376,16 +379,16 @@ end end end; -if (pX <> round(Gear.X)) and ((Gear.State and gstFalling) = 0) then +if (pX <> hwRound(Gear^.X)) and ((Gear^.State and gstFalling) = 0) then begin Result:= true; - exit + exit(Result) end -until (pX = round(Gear.X)) and (pY = round(Gear.Y)) and ((Gear.State and gstFalling) = 0); +until (pX = hwRound(Gear^.X)) and (pY = hwRound(Gear^.Y)) and ((Gear^.State and gstFalling) = 0); HHJump(AltGear, jmpHJump, GoInfo) end; -function rndSign(num: integer): integer; +{function rndSign(num: integer): integer; begin if random(2) = 0 then Result:= num else Result:= - num