Changeset 663 for trunk/AI/StdAI

Timestamp:

Jul 5, 2025, 10:57:12 AM (11 hours ago)

Author:

chronos

Message:

• Fixed: Fixed unit move style hostile calculation in StdAI. Engineers don't take hostile damage on hostile terrain.

Location:

trunk/AI/StdAI

Files:

• CustomAI.pas (modified) (2 diffs)
• ToolAI.pas (modified) (1 diff)

trunk/AI/StdAI/CustomAI.pas

@@ -177 +177 @@
 
 procedure Loc_to_ab(Loc0, Loc: Integer; var A, B: Integer);
-{$IFDEF FPC}// freepascal
 var
   dx, dy: Integer;
@@ -187 +186 @@
   B := (dy - dx) div 2;
 end;
-
-{$ELSE}// delphi
-register;
-asm
-push ebx
-
-// calculate
-push ecx
-div Byte ptr [G]
-xor ebx,ebx
-mov bl,ah  // ebx:=Loc0 mod G.lx
-mov ecx,eax
-and ecx,$000000FF // ecx:=Loc0 div G.lx
-mov eax,edx
-div Byte ptr [G]
-xor edx,edx
-mov dl,ah // edx:=Loc mod G.lx
-and eax,$000000FF // eax:=Loc div G.lx
-sub edx,ebx // edx:=Loc mod G.lx-Loc0 mod G.lx
-mov ebx,eax
-sub ebx,ecx // ebx:=dy
-and eax,1
-and ecx,1
-add edx,edx
-add eax,edx
-sub eax,ecx // eax:=dx, not normalized
-pop ecx
-
-// normalize
-mov edx,dword ptr [G]
-cmp eax,edx
-jl @A
-  sub eax,edx
-  sub eax,edx
-  jmp @ok
-@A:
-neg edx
-cmp eax,edx
-jnl @ok
-  sub eax,edx
-  sub eax,edx
-
-// return results
-@ok:
-mov edx,ebx
-sub edx,eax
-add eax,ebx
-sar edx,1 // edx:=b
-mov ebx,[B]
-mov [ebx],edx
-sar eax,1 // eax:=a
-mov [A],eax
-
-pop ebx
-end;
-{$ENDIF}
 
 procedure ab_to_V8(A, B: Integer; var V8: Integer);

trunk/AI/StdAI/ToolAI.pas

@@ -613 +613 @@
       dGround:
       begin
-        Inc(Result, (50 + (Speed - 150) * 13 shr 7) shl 8); //HeavyCost
+        Inc(Result, (50 + (Speed - 150) * 13 shr 7) shl 8); // HeavyCost
         if RO.Wonder[woShinkansen].EffectiveOwner <> Me then
           Inc(Result, Speed * (4 * 1311) shr 17); // RailCost
-        if (RO.Wonder[woGardens].EffectiveOwner <> Me) or
-          (Kind = mkSettler) and (Speed >= 200) then
+        if (RO.Wonder[woGardens].EffectiveOwner <> Me) and
+          not ((Kind = mkSettler) and (Speed >= 200)) then
           Inc(Result, msHostile);
         if Kind = mkDiplomat then