Changeset 663

Timestamp:

Jul 5, 2025, 10:57:12 AM (3 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

Files:

• AI/StdAI/CustomAI.pas (modified) (2 diffs)
• AI/StdAI/ToolAI.pas (modified) (1 diff)
• UnitProcessing.pas (modified) (15 diffs)

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

trunk/UnitProcessing.pas

@@ -21 +21 @@
   Worked: array [0 .. nPl - 1] of Integer; { settler work statistics }
 
-  // Moving/Combat
+// Moving/Combat
 function HostileDamage(P, mix, Loc, MP: Integer): Integer;
 function CalculateMove(P, uix, ToLoc, MoveLength: Integer; TestOnly: Boolean;
@@ -79 +79 @@
   ToWork: ^TToWorkList; { work left for each tile and job }
 
-  {
-    Moving/Combat
-    ____________________________________________________________________
-  }
+{
+  Moving/Combat
+  ____________________________________________________________________
+}
 function HostileDamage(P, mix, Loc, MP: Integer): Integer;
 var
@@ -97 +97 @@
   begin
     Assert((Tile and fTerImp <> tiIrrigation) and (Tile and fTerImp <> tiFarm));
-    Result := (DesertThurst * MP - 1) div RW[P].Model[mix].Speed + 1
+    Result := (DesertThurst * MP - 1) div RW[P].Model[mix].Speed + 1;
   end
   else if Tile and fTerrain = fArctic then
   begin
     Assert((Tile and fTerImp <> tiIrrigation) and (Tile and fTerImp <> tiFarm));
-    Result := (ArcticThurst * MP - 1) div RW[P].Model[mix].Speed + 1
+    Result := (ArcticThurst * MP - 1) div RW[P].Model[mix].Speed + 1;
   end
   else
@@ -346 +346 @@
         begin
           Result := eOK;
-          MoveInfo.MountainDelay := True
+          MoveInfo.MountainDelay := True;
         end;
       end;
@@ -748 +748 @@
         Recovery := FastRecovery { city has baracks/shipyard/airport }
       else
-        Recovery := CityRecovery
+        Recovery := CityRecovery;
     end
     else if (RealMap[Loc] and fTerrain >= fGrass) and (Model[mix].Domain <> dAir)
@@ -778 +778 @@
   gmaAlpine = 8;
 var
-  I, FromLoc, EndLoc, T, T1, maxmov, initmov, Loc, Loc1, FromTile, ToTile, V8,
+  I, FromLoc, EndLoc, T, T1, MaxMov, InitMov, Loc, Loc1, FromTile, ToTile, V8,
     MoveInfo, HeavyCost, RailCost, MoveCost, AddDamage, MaxDamage,
     MovementLeft: Integer;
@@ -867 +867 @@
   Damage[FromLoc] := 0;
   Q := TIPQ.Create(MapSize);
-  Q.Put(FromLoc, (maxmov - RW[P].Un[uix].Movement) shl 8);
+  Q.Put(FromLoc, (MaxMov - RW[P].Un[uix].Movement) shl 8);
   while Q.Get(Loc, T) do
   begin
@@ -955 +955 @@
                   3:
                     begin
-                      MoveCost := maxmov;
+                      MoveCost := MaxMov;
                       MountainDelay := True;
                     end;
@@ -967 +967 @@
                   if V8 and 1 <> 0 then
                     AddDamage := ((DesertThurst * 3) * MoveCost - 1)
-                      div maxmov + 1
+                      div MaxMov + 1
                   else
                     AddDamage := ((DesertThurst * 2) * MoveCost - 1)
-                      div maxmov + 1
+                      div MaxMov + 1;
                 end
                 else if ToTile and (fTerrain or fCity or fRiver or fCanal) = fArctic
@@ -977 +977 @@
                   if V8 and 1 <> 0 then
                     AddDamage := ((ArcticThurst * 3) * MoveCost - 1)
-                      div maxmov + 1
+                      div MaxMov + 1
                   else
                     AddDamage := ((ArcticThurst * 2) * MoveCost - 1)
-                      div maxmov + 1
+                      div MaxMov + 1;
                 end;
-            end
-            else
-              MoveCost := -1;
-
+            end else MoveCost := -1;
           end;
 
@@ -998 +995 @@
             fOwned) // assume ship/airplane is transport -- load!
             or (MoveCost >= 0) and (FromTile and fTerrain < fGrass)) then
-            MoveCost := maxmov; // transport load or unload
+            MoveCost := MaxMov; // transport load or unload
 
           if MoveCost >= 0 then
           begin { valid move }
-            MovementLeft := maxmov - T shr 8 and $FFF - MoveCost;
+            MovementLeft := MaxMov - T shr 8 and $FFF - MoveCost;
             if (MovementLeft < 0) or ((MoveCost = 0) and (MovementLeft = 0))
             then
@@ -1011 +1008 @@
                 if FromTile and (fTerrain or fCity or fRiver or fCanal or
                   fSpecial1 { Oasis } ) = fDesert then
-                  Inc(AddDamage, (DesertThurst * (maxmov - T shr 8 and $FFF) -
-                    1) div maxmov + 1)
+                  Inc(AddDamage, (DesertThurst * (MaxMov - T shr 8 and $FFF) -
+                    1) div MaxMov + 1)
                 else if FromTile and (fTerrain or fCity or fRiver or fCanal) = fArctic
                 then
-                  Inc(AddDamage, (ArcticThurst * (maxmov - T shr 8 and $FFF) -
-                    1) div maxmov + 1);
-
-              T1 := T and $7FF000FF + $100000 + (initmov + MoveCost) shl 8;
+                  Inc(AddDamage, (ArcticThurst * (MaxMov - T shr 8 and $FFF) -
+                    1) div MaxMov + 1);
+
+              T1 := T and $7FF000FF + $100000 + (InitMov + MoveCost) shl 8;
             end
             else
@@ -1062 +1059 @@
             mod (2 * lx) - lx;
           A.dy[I] := Loc div lx - From[Loc] div lx;
-        end
+        end;
       end;
       Loc := From[Loc];
     end;
-    A.MaxHostile_MovementLeft := maxmov - Time[EndLoc] shr 8 and $FFF;
+    A.MaxHostile_MovementLeft := MaxMov - Time[EndLoc] shr 8 and $FFF;
     if A.nStep > 25 then
       A.nStep := 25;
-    Result := eOK
+    Result := eOK;
   end
   else
@@ -1412 +1409 @@
           for uix1 := 0 to RW[P].nUn - 1 do
             if (RW[P].Un[uix1].Loc = Loc) and (RW[P].Un[uix1].Job = j0) then
-              RW[P].Un[uix1].Job := jNone
+              RW[P].Un[uix1].Job := jNone;
         end
         else
@@ -1421 +1418 @@
           Health := Health - HostileDamage(P, mix, Loc, Movement);
           Movement := 0;
-        end
-    end
+        end;
+    end;
 end;