# HG changeset patch # User nemo # Date 1268880942 0 # Node ID 13ceaad4767e8af51257c890ceb7d402bbf1edb2 # Parent 4a52e070501138ae8e9b3756ec7ab90d70f4f921 Adjust tests for cluster and watermelon, add molotov, assign FP test to whip, try to keep AI from attempting fire walking. diff -r 4a52e0705011 -r 13ceaad4767e hedgewars/uAIAmmoTests.pas --- a/hedgewars/uAIAmmoTests.pas Thu Mar 18 02:27:46 2010 +0000 +++ b/hedgewars/uAIAmmoTests.pas Thu Mar 18 02:55:42 2010 +0000 @@ -32,6 +32,7 @@ function TestBazooka(Me: PGear; Targ: TPoint; Level: LongInt; var ap: TAttackParams): LongInt; function TestGrenade(Me: PGear; Targ: TPoint; Level: LongInt; var ap: TAttackParams): LongInt; +function TestMolotov(Me: PGear; Targ: TPoint; Level: LongInt; var ap: TAttackParams): LongInt; function TestClusterBomb(Me: PGear; Targ: TPoint; Level: LongInt; var ap: TAttackParams): LongInt; function TestWatermelon(Me: PGear; Targ: TPoint; Level: LongInt; var ap: TAttackParams): LongInt; function TestMortar(Me: PGear; Targ: TPoint; Level: LongInt; var ap: TAttackParams): LongInt; @@ -62,7 +63,7 @@ (proc: @TestDesertEagle; flags: 0), // amDEagle (proc: nil; flags: 0), // amDynamite (proc: @TestFirePunch; flags: 0), // amFirePunch - (proc: nil; flags: 0), // amWhip + (proc: @TestFirePunch; flags: 0), // amWhip (proc: @TestBaseballBat; flags: 0), // amBaseballBat (proc: nil; flags: 0), // amParachute (proc: @TestAirAttack; flags: amtest_OnTurn), // amAirAttack @@ -89,7 +90,7 @@ (proc: nil; flags: 0), // amVampiric (proc: nil; flags: 0), // amSniperRifle (proc: nil; flags: 0), // amJetpack - (proc: nil; flags: 0) // amMolotov + (proc: @TestMolotov; flags: 0) // amMolotov ); const BadTurn = Low(LongInt) div 4; @@ -159,6 +160,58 @@ TestBazooka:= valueResult end; +function TestMolotov(Me: PGear; Targ: TPoint; Level: LongInt; var ap: TAttackParams): LongInt; +const tDelta = 24; +var Vx, Vy, r: hwFloat; + Score, EX, EY, valueResult: LongInt; + TestTime: Longword; + + function CheckTrace: LongInt; + var x, y, dY: hwFloat; + t: LongInt; + begin + x:= Me^.X; + y:= Me^.Y; + dY:= -Vy; + t:= TestTime; + repeat + x:= x + Vx; + y:= y + dY; + dY:= dY + cGravity; + dec(t) + until TestCollExcludingMe(Me, hwRound(x), hwRound(y), 7) or (t = 0); + EX:= hwRound(x); + EY:= hwRound(y); + if t < 50 then CheckTrace:= RateExplosion(Me, EX, EY, 97) // average of 17 attempts, most good, but some failing spectacularly + else CheckTrace:= BadTurn + end; +begin +valueResult:= BadTurn; +TestTime:= 0; +ap.ExplR:= 0; +repeat + inc(TestTime, 1000); + Vx:= (int2hwFloat(Targ.X) - Me^.X) / int2hwFloat(TestTime + tDelta); + Vy:= cGravity * ((TestTime + tDelta) div 2) - (int2hwFloat(Targ.Y) - Me^.Y) / int2hwFloat(TestTime + tDelta); + r:= Distance(Vx, Vy); + if not (r > _1) then + begin + Score:= CheckTrace; + if valueResult < Score then + begin + ap.Angle:= DxDy2AttackAngle(Vx, Vy) + AIrndSign(random(Level)); + ap.Power:= hwRound(r * cMaxPower) + AIrndSign(random(Level) * 15); + ap.Time:= TestTime; + ap.ExplR:= 100; + ap.ExplX:= EX; + ap.ExplY:= EY; + valueResult:= Score + end; + end +until (TestTime = 4000); +TestMolotov:= valueResult +end; + function TestGrenade(Me: PGear; Targ: TPoint; Level: LongInt; var ap: TAttackParams): LongInt; const tDelta = 24; var Vx, Vy, r: hwFloat; @@ -233,7 +286,7 @@ until TestCollExcludingMe(Me, hwRound(x), hwRound(y), 5) or (t = 0); EX:= hwRound(x); EY:= hwRound(y); - if t < 50 then CheckTrace:= RateExplosion(Me, EX, EY, 91) + if t < 50 then CheckTrace:= RateExplosion(Me, EX, EY, 81) else CheckTrace:= BadTurn end; begin @@ -242,8 +295,12 @@ ap.ExplR:= 0; repeat inc(TestTime, 1000); - Vx:= (int2hwFloat(Targ.X) - Me^.X) / int2hwFloat(TestTime + tDelta); - Vy:= cGravity * ((TestTime + tDelta) div 2) - (int2hwFloat(Targ.Y) - Me^.Y) / int2hwFloat(TestTime + tDelta); + // Try to overshoot slightly, seems to pay slightly better dividends in terms of hitting cluster + if Me^.X _1) then begin @@ -251,7 +308,7 @@ if valueResult < Score then begin ap.Angle:= DxDy2AttackAngle(Vx, Vy) + AIrndSign(random(Level)); - ap.Power:= hwRound(r * cMaxPower) + AIrndSign(random(Level) * 15)+10; + ap.Power:= hwRound(r * cMaxPower) + AIrndSign(random(Level) * 15); ap.Time:= TestTime; ap.ExplR:= 90; ap.ExplX:= EX; @@ -285,7 +342,7 @@ until TestCollExcludingMe(Me, hwRound(x), hwRound(y), 5) or (t = 0); EX:= hwRound(x); EY:= hwRound(y); - if t < 50 then CheckTrace:= RateExplosion(Me, EX, EY, 301) + if t < 50 then CheckTrace:= RateExplosion(Me, EX, EY, 381) else CheckTrace:= BadTurn end; begin @@ -295,7 +352,7 @@ repeat inc(TestTime, 1000); Vx:= (int2hwFloat(Targ.X) - Me^.X) / int2hwFloat(TestTime + tDelta); - Vy:= cGravity * ((TestTime + tDelta) div 2) - (int2hwFloat(Targ.Y) - Me^.Y) / int2hwFloat(TestTime + tDelta); + Vy:= cGravity * ((TestTime + tDelta) div 2) - (int2hwFloat(Targ.Y-125) - Me^.Y) / int2hwFloat(TestTime + tDelta); r:= Distance(Vx, Vy); if not (r > _1) then begin @@ -303,7 +360,7 @@ if valueResult < Score then begin ap.Angle:= DxDy2AttackAngle(Vx, Vy) + AIrndSign(random(Level)); - ap.Power:= hwRound(r * cMaxPower) + AIrndSign(random(Level) * 15)+50; + ap.Power:= hwRound(r * cMaxPower) + AIrndSign(random(Level) * 15); ap.Time:= TestTime; ap.ExplR:= 300; ap.ExplX:= EX; diff -r 4a52e0705011 -r 13ceaad4767e hedgewars/uAIMisc.pas --- a/hedgewars/uAIMisc.pas Thu Mar 18 02:27:46 2010 +0000 +++ b/hedgewars/uAIMisc.pas Thu Mar 18 02:55:42 2010 +0000 @@ -136,6 +136,8 @@ begin case Gear^.Kind of gtCase: AddBonus(hwRound(Gear^.X), hwRound(Gear^.Y), 33, 25); + gtFlame: if (Gear^.State and gsttmpFlag) <> 0 then + AddBonus(hwRound(Gear^.X), hwRound(Gear^.Y), 20, -50); gtMine: if (Gear^.State and gstAttacking) = 0 then AddBonus(hwRound(Gear^.X), hwRound(Gear^.Y), 50, -50) else