sheepy-clone: comparison hedgewars/uAI.pas

equal deleted inserted replaced

-:57a508884052
+:0a494f951dcf
 procedure FreeActionsList;
 implementation
 uses uConsts, SDLh, uAIMisc, uAIAmmoTests, uAIActions,
 uAmmos, SysUtils{$IFNDEF USE_SDLTHREADS} {$IFDEF UNIX}, cthreads{$ENDIF} {$ENDIF}, uTypes,
-uVariables, uCommands, uUtils, uDebug;
+uVariables, uCommands, uUtils, uDebug, uAILandMarks;
 var BestActions: TActions;
 CanUseAmmo: array [TAmmoType] of boolean;
 StopThinking: boolean;
 {$IFDEF USE_SDLTHREADS}
 if (Ammoz[a].Ammo.Propz and ammoprop_AttackingPut) = 0 then
 begin
 AddAction(BestActions, aia_attack, aim_push, 650 + random(300), 0, 0);
 AddAction(BestActions, aia_attack, aim_release, ap.Power, 0, 0);
 end;
+if (Ammoz[a].Ammo.Propz and ammoprop_Track) <> 0 then
+begin
+AddAction(BestActions, aia_waitAmmoXY, 0, 12, ap.ExplX, ap.ExplY);
+AddAction(BestActions, aia_attack, aim_push, 1, 0, 0);
+AddAction(BestActions, aia_attack, aim_release, 7, 0, 0);
+end;
 if ap.ExplR > 0 then
 AddAction(BestActions, aia_AwareExpl, ap.ExplR, 10, ap.ExplX, ap.ExplY);
 end
 end;
 if a = High(TAmmoType) then
 or StopThinking
 end
 end;
 procedure Walk(Me: PGear; var Actions: TActions);
-const FallPixForBranching = cHHRadius * 2 + 8;
+const FallPixForBranching = cHHRadius;
 var
 ticks, maxticks, steps, tmp: Longword;
 BaseRate, BestRate, Rate: integer;
 GoInfo: TGoInfo;
 CanGo: boolean;
 if ticks > maxticks then
 break;
 if (BotLevel < 5) and (GoInfo.JumpType = jmpHJump) then // hjump support
 if Push(ticks, Actions, AltMe, Me^.Message) then
+begin
 with Stack.States[Pred(Stack.Count)] do
 begin
 if Me^.dX.isNegative then
 AddAction(MadeActions, aia_LookRight, 0, 200, 0, 0)
 else
 if Me^.dX.isNegative then
 AddAction(MadeActions, aia_LookLeft, 0, 200, 0, 0)
 else
 AddAction(MadeActions, aia_LookRight, 0, 200, 0, 0);
 end;
+// check if we could go backwards and maybe ljump over a gap after this hjump
+Push(ticks, Stack.States[Pred(Stack.Count)].MadeActions, AltMe, Me^.Message xor 3)
+end;
 if (BotLevel < 3) and (GoInfo.JumpType = jmpLJump) then // ljump support
 begin
-// push current position so we proceed from it after checking jump opportunities
+// at final check where we go after jump walking backward
+if Push(ticks, Actions, AltMe, Me^.Message xor 3) then
+with Stack.States[Pred(Stack.Count)] do
+AddAction(MadeActions, aia_LJump, 0, 305 + random(50), 0, 0);
+// push current position so we proceed from it after checking jump+forward walk opportunities
 if CanGo then Push(ticks, Actions, Me^, Me^.Message);
-// first check where we go after jump
+// first check where we go after jump walking forward
 if Push(ticks, Actions, AltMe, Me^.Message) then
 with Stack.States[Pred(Stack.Count)] do
 AddAction(MadeActions, aia_LJump, 0, 305 + random(50), 0, 0);
 break
 end;
 BestRate:= Rate;
 Me^.State:= Me^.State or gstAttacked // we have better place, go there and do not use ammo
 end
 else if Rate < BestRate then
 break;
 if ((Me^.State and gstAttacked) = 0) and ((steps mod 4) = 0) then
+begin
+if (steps > 4) and checkMark(hwRound(Me^.X), hwRound(Me^.Y), markWasHere) then
+break;
+addMark(hwRound(Me^.X), hwRound(Me^.Y), markWasHere);
 TestAmmos(Actions, Me, true);
+end;
 if GoInfo.FallPix >= FallPixForBranching then
 Push(ticks, Actions, Me^, Me^.Message xor 3); // aia_Left xor 3 = aia_Right
 end {while};
 if BestRate > BaseRate then
 currHedgehogIndex:= CurrentTeam^.CurrHedgehog;
 itHedgehog:= currHedgehogIndex;
 switchesNum:= 0;
 switchImmediatelyAvailable:= (CurAmmoGear <> nil) and (CurAmmoGear^.Kind = gtSwitcher);
-switchCount:= HHHasAmmo(PGear(Me)^.Hedgehog^, amSwitch);
+if PGear(Me)^.Hedgehog^.BotLevel <> 5 then
+switchCount:= HHHasAmmo(PGear(Me)^.Hedgehog^, amSwitch)
+else switchCount:= 0;
 if (PGear(Me)^.State and gstAttacked) = 0 then
 if Targets.Count > 0 then
 begin
 // iterate over current team hedgehogs
 else
 begin
 BackMe:= PGear(Me)^;
 while (not StopThinking) and (BestActions.Count = 0) do
 begin
+(*
+// Maybe this would get a bit of movement out of them? Hopefully not *toward* water. Need to check how often he'd choose that strategy
+if SuddenDeathDmg and ((hwRound(BackMe.Y)+cWaterRise*2) > cWaterLine) then
+AddBonus(hwRound(BackMe.X), hwRound(BackMe.Y), 250, -40);
+*)
 FillBonuses(true);
 WalkMe:= BackMe;
 Actions.Count:= 0;
 Actions.Pos:= 0;
 Actions.Score:= 0;
 if not StopThinking then
 SDL_Delay(100)
 end
 end;
-PGear(Me)^.State:= PGear(Me)^.State and not gstHHThinking;
+PGear(Me)^.State:= PGear(Me)^.State and (not gstHHThinking);
 Think:= 0;
 InterlockedDecrement(hasThread)
 end;
 procedure StartThink(Me: PGear);
 begin
 if ((Me^.State and (gstAttacking or gstHHJumping or gstMoving)) <> 0)
 or isInMultiShoot then
 exit;
-//DeleteCI(Me); // this might break demo
+//DeleteCI(Me); // this will break demo/netplay
+clearAllMarks;
 Me^.State:= Me^.State or gstHHThinking;
 Me^.Message:= 0;
 BestActions.Count:= 0;
 BestActions.Pos:= 0;
 StartThink(Gear);
 StartTicks:= GameTicks
 end else
 begin
-(*
+{if not scoreShown then
-if not scoreShown then
 begin
 if BestActions.Score > 0 then ParseCommand('/say Expected score = ' + inttostr(BestActions.Score div 1024), true);
 scoreShown:= true
-end;*)
+end;}
 ProcessAction(BestActions, Gear)
 end
 else if ((GameTicks - StartTicks) > cMaxAIThinkTime)
 or (TurnTimeLeft <= cStopThinkTime) then
 StopThinking:= true

changeset 7439	0a494f951dcf
parent 7437	a46ce1812419
child 7446	9ce6e2c35413