Changeset 447 for trunk/AI/StdAI/ToolAI.pas

Timestamp:

May 19, 2022, 10:39:34 PM (2 years ago)

Author:

chronos

Message:

• Modified: Use first capital letter in identifiers.

File:

• trunk/AI/StdAI/ToolAI.pas (modified) (67 diffs)

trunk/AI/StdAI/ToolAI.pas

@@ -11 +11 @@
 type
   TGroupTransportPlan = record
-    LoadLoc, uixTransport, nLoad, TurnsEmpty, TurnsLoaded: integer;
-    uixLoad: array[0..15] of integer;
+    LoadLoc, uixTransport, nLoad, TurnsEmpty, TurnsLoaded: Integer;
+    uixLoad: array[0..15] of Integer;
   end;
 
@@ -18 +18 @@
   TToolAI = class(TCustomAI)
   protected
-  {$IFDEF DEBUG}DebugMap: array[0..lxmax * lymax - 1] of integer;{$ENDIF}
-
-    function CenterOfEmpire: integer;
+  {$IFDEF DEBUG}DebugMap: array[0..lxmax * lymax - 1] of Integer;{$ENDIF}
+
+    function CenterOfEmpire: Integer;
     // tile that is in the middle of all own cities
 
-    function CityTaxBalance(cix: integer; const CityReport: TCityReport): integer;
+    function CityTaxBalance(cix: Integer; const CityReport: TCityReport): Integer;
     // calculates exact difference of income and maintenance cost for a single city
     // positive result = income higher than maintenance
@@ -29 +29 @@
     // respects production and food converted to gold
     // CityReport must have been prepared before
-    procedure SumCities(TaxRate: integer; var TaxSum, ScienceSum: integer);
+    procedure SumCities(TaxRate: Integer; var TaxSum, ScienceSum: Integer);
     // calculates exact total tax and science income
     // tax is reduced by maintenance (so might be negative)
@@ -46 +46 @@
     procedure JobAssignment_Initialize;
     // initialization, must be called first of the JobAssignment functions
-    procedure JobAssignment_AddJob(Loc, Job, Score: integer);
+    procedure JobAssignment_AddJob(Loc, Job, Score: Integer);
     // add job for settlers with certain score
     // jobs include founding cities!
-    procedure JobAssignment_AddUnit(uix: integer);
+    procedure JobAssignment_AddUnit(uix: Integer);
     // add a settler unit to do jobs
     procedure JobAssignment_Go;
@@ -57 +57 @@
     // starting a job one turn earlier counts the same as 4 points of score
     // function does not cancel jobs that are already started
-    function JobAssignment_GotJob(uix: integer): boolean;
+    function JobAssignment_GotJob(uix: Integer): Boolean;
     // can be called after JobAssignment_Go to find out whether
     // a certain settler has been assigned a job to
@@ -64 +64 @@
     // calculates formations and districts
 
-    function CheckStep(MoveStyle, TimeBeforeStep, CrossCorner: integer;
-      var TimeAfterStep, RecoverTurns: integer; FromTile, ToTile: integer;
-      IsCapture: boolean): integer;
+    function CheckStep(MoveStyle, TimeBeforeStep, CrossCorner: Integer;
+      var TimeAfterStep, RecoverTurns: Integer; FromTile, ToTile: Integer;
+      IsCapture: Boolean): Integer;
     // forecast single unit move between adjacent tiles
     // format of TimeBeforeStep and TimeAfterStep: $1000*number of turns + $800-MP left
@@ -74 +74 @@
     // CrossCorner=1 for long moves that cross the tile corner, =0 for short ones that don't
 
-    function GetMyMoveStyle(mix, Health: integer): integer;
-
-    function Unit_MoveEx(uix, ToLoc: integer; Options: integer = 0): integer;
+    function GetMyMoveStyle(mix, Health: Integer): Integer;
+
+    function Unit_MoveEx(uix, ToLoc: Integer; Options: Integer = 0): Integer;
 
     procedure SeaTransport_BeginInitialize;
@@ -90 +90 @@
     // - all transports have same capacity
     // - no transport is damaged
-    procedure SeaTransport_AddLoad(uix: integer);
-    procedure SeaTransport_AddTransport(uix: integer);
-    procedure SeaTransport_AddDestination(Loc: integer);
-    function SeaTransport_MakeGroupPlan(var TransportPlan: TGroupTransportPlan): boolean;
+    procedure SeaTransport_AddLoad(uix: Integer);
+    procedure SeaTransport_AddTransport(uix: Integer);
+    procedure SeaTransport_AddDestination(Loc: Integer);
+    function SeaTransport_MakeGroupPlan(var TransportPlan: TGroupTransportPlan): Boolean;
     // make plan for group of units to transport from a single loading location by a single transport
     // the plan optimizes:
@@ -103 +103 @@
     // function returns false if no more transports are possible
 
-    function CurrentMStrength(Domain: integer): integer;
+    function CurrentMStrength(Domain: Integer): Integer;
   end;
 
@@ -132 +132 @@
 
 var
-  nContinent, nOcean, nDistrict: integer;
-  Formation: array[0..lxmax * lymax - 1] of integer;
+  nContinent, nOcean, nDistrict: Integer;
+  Formation: array[0..lxmax * lymax - 1] of Integer;
   // water: ocean index, land: continent index, sorted by size
   // territory unpassable due to peace treaty divides a continent
-  District: array[0..lxmax * lymax - 1] of integer;
+  District: array[0..lxmax * lymax - 1] of Integer;
   // index of coherent own territory, sorted by size
-  CityResult: array[0..nCmax - 1] of integer;
-
-  Advancedness: array[0..nAdv - 1] of integer;
+  CityResult: array[0..nCmax - 1] of Integer;
+
+  Advancedness: array[0..nAdv - 1] of Integer;
 // total number of prerequisites for each advance
 
@@ -149 +149 @@
 
 type
-  pinteger = ^integer;
+  pinteger = ^Integer;
 
 var
   // for JobAssignment
-  MaxScore: integer;
-  TileJob, TileJobScore: array[0..lxmax * lymax - 1] of byte;
-  JobLocOfSettler: array[0..nUmax - 1] of integer; // ToAssign = find job
+  MaxScore: Integer;
+  TileJob, TileJobScore: array[0..lxmax * lymax - 1] of Byte;
+  JobLocOfSettler: array[0..nUmax - 1] of Integer; // ToAssign = find job
 
   // for Transport
-  TransportMoveStyle, TransportCapacity, nTransportLoad: integer;
-  InitComplete, HaveDestinations: boolean;
-  uixTransportLoad, TransportAvailable: array[0..nUmax - 1] of integer;
-  TurnsAfterLoad: array[0..lxmax * lymax - 1] of shortint;
-
-procedure ReplaceD(Start, Stop: pinteger; Raider, Twix: integer);
+  TransportMoveStyle, TransportCapacity, nTransportLoad: Integer;
+  InitComplete, HaveDestinations: Boolean;
+  uixTransportLoad, TransportAvailable: array[0..nUmax - 1] of Integer;
+  TurnsAfterLoad: array[0..lxmax * lymax - 1] of ShortInt;
+
+procedure ReplaceD(Start, Stop: pinteger; Raider, Twix: Integer);
 begin
   while Start <> Stop do
@@ -173 +173 @@
 end;
 
-function NextZero(Start, Stop: pinteger; Mask: cardinal): pinteger;
+function NextZero(Start, Stop: pinteger; Mask: Cardinal): pinteger;
 begin
   while (Start <> Stop) and (Start^ and Mask <> 0) do
@@ -180 +180 @@
 end;
 
-function TToolAI.CenterOfEmpire: integer;
-var
-  cix, Loc, x, y, sy, n: integer;
-  a, su, sv: double;
-begin
-  n := 0;
+function TToolAI.CenterOfEmpire: Integer;
+var
+  cix, Loc, X, Y, sy, N: Integer;
+  A, su, sv: Double;
+begin
+  N := 0;
   sy := 0;
   su := 0;
@@ -194 +194 @@
     if Loc >= 0 then
     begin
-      y := Loc div G.lx;
-      x := Loc - y * G.lx;
-      Inc(sy, y);
-      a := 2 * pi * x / G.lx;
-      su := su + cos(a);
-      sv := sv + sin(a);
-      Inc(n);
-    end;
-  end;
-  a := arctan2(sv, su);
-  x := round(G.lx * a / (2 * pi));
-  while x >= G.lx do
-    Dec(x, G.lx);
-  while x < 0 do
-    Inc(x, G.lx);
-  Result := ((2 * sy + n) div (2 * n)) * G.lx + x;
-end;
-
-function TToolAI.CityTaxBalance(cix: integer; const CityReport: TCityReport): integer;
-var
-  i: integer;
+      Y := Loc div G.lx;
+      X := Loc - Y * G.lx;
+      Inc(sy, Y);
+      A := 2 * pi * X / G.lx;
+      su := su + cos(A);
+      sv := sv + sin(A);
+      Inc(N);
+    end;
+  end;
+  A := arctan2(sv, su);
+  X := round(G.lx * A / (2 * pi));
+  while X >= G.lx do
+    Dec(X, G.lx);
+  while X < 0 do
+    Inc(X, G.lx);
+  Result := ((2 * sy + N) div (2 * N)) * G.lx + X;
+end;
+
+function TToolAI.CityTaxBalance(cix: Integer; const CityReport: TCityReport): Integer;
+var
+  I: Integer;
 begin
   Result := 0;
@@ -229 +229 @@
       Inc(Result, CityReport.FoodRep - CityReport.Eaten);
   end;
-  for i := nWonder to nImp - 1 do
-    if MyCity[cix].Built[i] > 0 then
-      Dec(Result, Imp[i].Maint);
-end;
-
-procedure TToolAI.SumCities(TaxRate: integer; var TaxSum, ScienceSum: integer);
-var
-  cix, p1: integer;
+  for I := nWonder to nImp - 1 do
+    if MyCity[cix].Built[I] > 0 then
+      Dec(Result, Imp[I].Maint);
+end;
+
+procedure TToolAI.SumCities(TaxRate: Integer; var TaxSum, ScienceSum: Integer);
+var
+  cix, p1: Integer;
   CityReport: TCityReport;
 begin
@@ -242 +242 @@
   ScienceSum := 0;
   if RO.Government = gAnarchy then
-    exit;
+    Exit;
   for p1 := 0 to nPl - 1 do
     if RO.Tribute[p1] <= RO.TributePaid[p1] then
@@ -268 +268 @@
 procedure TToolAI.OptimizeCityTiles;
 var
-  cix: integer;
+  cix: Integer;
 begin
   for cix := 0 to RO.nCity - 1 do
@@ -278 +278 @@
 procedure TToolAI.GetCityProdPotential;
 var
-  cix: integer;
+  cix: Integer;
   Advice: TCityTileAdviceData;
 begin
@@ -286 +286 @@
       begin
         Advice.ResourceWeights := rwMaxProd;
-        Server(sGetCityTileAdvice, me, cix, Advice);
+        Server(sGetCityTileAdvice, Me, cix, Advice);
         CityResult[cix] := Advice.CityReport.ProdRep; // considers factory, but shouldn't
       end;
@@ -293 +293 @@
 procedure TToolAI.GetCityTradePotential;
 var
-  cix: integer;
+  cix: Integer;
   Advice: TCityTileAdviceData;
 begin
@@ -301 +301 @@
       begin
         Advice.ResourceWeights := rwMaxScience;
-        Server(sGetCityTileAdvice, me, cix, Advice);
+        Server(sGetCityTileAdvice, Me, cix, Advice);
         CityResult[cix] := Advice.CityReport.Trade;
       end;
@@ -314 +314 @@
 procedure TToolAI.JobAssignment_Initialize;
 begin
-  fillchar(JobLocOfSettler, RO.nUn * sizeof(integer), $FF); // -1
-  fillchar(TileJob, MapSize, jNone);
-  fillchar(TileJobScore, MapSize, 0);
+  FillChar(JobLocOfSettler, RO.nUn * SizeOf(Integer), $FF); // -1
+  FillChar(TileJob, MapSize, jNone);
+  FillChar(TileJobScore, MapSize, 0);
   MaxScore := 0;
 end;
 
-procedure TToolAI.JobAssignment_AddJob(Loc, Job, Score: integer);
+procedure TToolAI.JobAssignment_AddJob(Loc, Job, Score: Integer);
 begin
   if Score > 255 then
@@ -333 +333 @@
 end;
 
-procedure TToolAI.JobAssignment_AddUnit(uix: integer);
-begin
-  assert(MyModel[MyUnit[uix].mix].Kind in [mkSettler, mkSlaves]);
+procedure TToolAI.JobAssignment_AddUnit(uix: Integer);
+begin
+  Assert(MyModel[MyUnit[uix].mix].Kind in [mkSettler, mkSlaves]);
   JobLocOfSettler[uix] := ToAssign;
 end;
 
-function TToolAI.JobAssignment_GotJob(uix: integer): boolean;
+function TToolAI.JobAssignment_GotJob(uix: Integer): Boolean;
 begin
   Result := JobLocOfSettler[uix] >= 0;
@@ -347 +347 @@
 const
   DistanceScore = 4;
-  StepSizeByTerrain: array[0..11] of integer =
+  StepSizeByTerrain: array[0..11] of Integer =
     (0, 0, 1, 2, 1, 1, 0, 1, 0, 1, 1, 2);
   //Oc-Sh-Gr-De-Pr-Tu-Ar-Sw-XX-Fo-Hi-Mo
 var
   uix, BestScore, BestCount, BestLoc, BestJob, BestDistance, TestLoc,
-  NextLoc, TestDistance, V8, TestScore, StepSize, MoveResult: integer;
-  UnitsToAssign: boolean;
+  NextLoc, TestDistance, V8, TestScore, StepSize, MoveResult: Integer;
+  UnitsToAssign: Boolean;
   Adjacent: TVicinity8Loc;
   SettlerOfJobLoc, DistToLoc: array[0..lxmax * lymax - 1] of smallint;
   // DistToLoc is only defined where SettlerOfJobLoc>=0
-  TileChecked: array[0..lxmax * lymax - 1] of boolean;
-begin
-  fillchar(SettlerOfJobLoc, MapSize * 2, $FF); // -1
+  TileChecked: array[0..lxmax * lymax - 1] of Boolean;
+begin
+  FillChar(SettlerOfJobLoc, MapSize * 2, $FF); // -1
 
   // keep up jobs that are already started
@@ -380 +380 @@
         BestJob := jNone;
         BestScore := -999999;
-        FillChar(TileChecked, MapSize * sizeof(boolean), False);
+        FillChar(TileChecked, MapSize * SizeOf(Boolean), False);
         Pile.Create(MapSize);
         Pile.Put(MyUnit[uix].Loc, 0); // start search for new job at current location
@@ -399 +399 @@
                   and (Map[NextLoc] and (fUnit or fOwned) <> fUnit) // no foreign unit
                   and ((RO.Territory[NextLoc] < 0) or
-                  (RO.Territory[NextLoc] = me)) // no foreign territory
+                  (RO.Territory[NextLoc] = Me)) // no foreign territory
                   and (Map[TestLoc] and Map[NextLoc] and fInEnemyZoC = 0) then
                   // move not prevented by ZoC
@@ -414 +414 @@
             ((SettlerOfJobLoc[TestLoc] < 0) or (DistToLoc[TestLoc] > TestDistance)) then
           begin
-            TestScore := integer(TileJobScore[TestLoc]) - DistanceScore * TestDistance;
+            TestScore := Integer(TileJobScore[TestLoc]) - DistanceScore * TestDistance;
             if TestScore > BestScore then
               BestCount := 0;
@@ -469 +469 @@
 procedure TToolAI.AnalyzeMap;
 var
-  i, j, Loc, Loc1, V8, Count, Kind, MostIndex: integer;
+  I, J, Loc, Loc1, V8, Count, Kind, MostIndex: Integer;
   Adjacent: TVicinity8Loc;
   IndexOfID: array[0..lxmax * lymax - 1] of smallint;
   IDOfIndex: array[0..lxmax * lymax div 2 - 1] of smallint;
 begin
-  fillchar(District, MapSize * 4, $FF);
+  FillChar(District, MapSize * 4, $FF);
   for Loc := 0 to MapSize - 1 do
     if Map[Loc] and fTerrain = fUNKNOWN then
@@ -500 +500 @@
               Formation[Loc], Formation[Loc1]);
       end;
-      if (RO.Territory[Loc] = me) and (Map[Loc] and fTerrain >= fGrass) then
+      if (RO.Territory[Loc] = Me) and (Map[Loc] and fTerrain >= fGrass) then
       begin
         District[Loc] := Loc;
@@ -545 +545 @@
         Inc(Count);
       end;
-    for i := 0 to Count - 2 do
-    begin
-      MostIndex := i;
-      for j := i + 1 to Count - 1 do
-        if IndexOfID[IDOfIndex[j]] > IndexOfID[IDOfIndex[MostIndex]] then
-          MostIndex := j;
-      if MostIndex <> i then
-      begin
-        j := IDOfIndex[i];
-        IDOfIndex[i] := IDOfIndex[MostIndex];
-        IDOfIndex[MostIndex] := j;
-      end;
-    end;
-    for i := 0 to Count - 1 do
-      IndexOfID[IDOfIndex[i]] := i;
+    for I := 0 to Count - 2 do
+    begin
+      MostIndex := I;
+      for J := I + 1 to Count - 1 do
+        if IndexOfID[IDOfIndex[J]] > IndexOfID[IDOfIndex[MostIndex]] then
+          MostIndex := J;
+      if MostIndex <> I then
+      begin
+        J := IDOfIndex[I];
+        IDOfIndex[I] := IDOfIndex[MostIndex];
+        IDOfIndex[MostIndex] := J;
+      end;
+    end;
+    for I := 0 to Count - 1 do
+      IndexOfID[IDOfIndex[I]] := I;
 
     case Kind of
@@ -605 +605 @@
 // other:  |   Basic   | 0| Speed  |              X X X             | MaxTerrType  |
 
-function TToolAI.GetMyMoveStyle(mix, Health: integer): integer;
+function TToolAI.GetMyMoveStyle(mix, Health: Integer): Integer;
 begin
   with MyModel[mix] do
@@ -614 +614 @@
       begin
         Inc(Result, (50 + (Speed - 150) * 13 shr 7) shl 8); //HeavyCost
-        if RO.Wonder[woShinkansen].EffectiveOwner <> me then
+        if RO.Wonder[woShinkansen].EffectiveOwner <> Me then
           Inc(Result, Speed * (4 * 1311) shr 17); // RailCost
-        if (RO.Wonder[woGardens].EffectiveOwner <> me) or
+        if (RO.Wonder[woGardens].EffectiveOwner <> Me) or
           (Kind = mkSettler) and (Speed >= 200) then
           Inc(Result, msHostile);
@@ -631 +631 @@
       begin
         Result := Speed;
-        if RO.Wonder[woMagellan].EffectiveOwner = me then
+        if RO.Wonder[woMagellan].EffectiveOwner = Me then
           Inc(Result, 200);
         if Health < 100 then
@@ -646 +646 @@
 end;
 
-function TToolAI.CheckStep(MoveStyle, TimeBeforeStep, CrossCorner: integer;
-  var TimeAfterStep, RecoverTurns: integer; FromTile, ToTile: integer;
-  IsCapture: boolean): integer;
-var
-  MoveCost, RecoverCost: integer;
+function TToolAI.CheckStep(MoveStyle, TimeBeforeStep, CrossCorner: Integer;
+  var TimeAfterStep, RecoverTurns: Integer; FromTile, ToTile: Integer;
+  IsCapture: Boolean): Integer;
+var
+  MoveCost, RecoverCost: Integer;
 begin
   //IsCapture:=true;
-  assert(((FromTile and fTerrain <= fMountains) or (FromTile and
+  Assert(((FromTile and fTerrain <= fMountains) or (FromTile and
     fTerrain = fUNKNOWN)) and ((ToTile and fTerrain <= fMountains) or
     (ToTile and fTerrain = fUNKNOWN)));
@@ -701 +701 @@
                 if ToTile and fPeace <> 0 then
                   Result := csCheckTerritory;
-                exit;
+                Exit;
               end;
             end;
@@ -820 +820 @@
           begin
             Result := csForbiddenTile;
-            exit;
+            Exit;
           end;
         end
@@ -869 +869 @@
               // must wait for next turn
               Result := csOk;
-              exit;
+              Exit;
             end;
           end;
@@ -894 +894 @@
 -------- Pathfinding Reference Implementation --------
 var
-MoveStyle,V8,Loc,Time,NextLoc,NextTime,RecoverTurns: integer;
+MoveStyle,V8,Loc,Time,NextLoc,NextTime,RecoverTurns: Integer;
 Adjacent: TVicinity8Loc;
-Reached: array[0..lxmax*lymax-1] of boolean;
-begin
-fillchar(Reached, MapSize, false);
+Reached: array[0..lxmax*lymax-1] of Boolean;
+begin
+FillChar(Reached, MapSize, False);
 MoveStyle:=GetMyMoveStyle(MyUnit[uix].mix, MyUnit[uix].Health);
 Pile.Create(MapSize);
@@ -906 +906 @@
   // todo: check exit condition, e.g. whether destination reached
 
-  Reached[Loc]:=true;
+  Reached[Loc]:=True;
   V8_to_Loc(Loc, Adjacent);
   for V8:=0 to 7 do
@@ -916 +916 @@
           Pile.Put(NextLoc, NextTime+RecoverTurns*$1000);
         csForbiddenTile:
-          Reached[NextLoc]:=true; // don't check moving there again
+          Reached[NextLoc]:=True; // don't check moving there again
         csCheckTerritory:
           if RO.Territory[NextLoc]=RO.Territory[Loc] then
@@ -927 +927 @@
 *)
 
-function TToolAI.Unit_MoveEx(uix, ToLoc: integer; Options: integer): integer;
+function TToolAI.Unit_MoveEx(uix, ToLoc: Integer; Options: Integer): Integer;
 var
   Loc, NextLoc, Temp, FromLoc, EndLoc, Time, V8, MoveResult, RecoverTurns,
-  NextTime, MoveStyle: integer;
+  NextTime, MoveStyle: Integer;
   Adjacent: TVicinity8Loc;
-  PreLoc: array[0..lxmax * lymax - 1] of integer;
-  Reached: array[0..lxmax * lymax - 1] of boolean;
+  PreLoc: array[0..lxmax * lymax - 1] of Integer;
+  Reached: array[0..lxmax * lymax - 1] of Boolean;
 begin
   Result := eOk;
   FromLoc := MyUnit[uix].Loc;
   if FromLoc = ToLoc then
-    exit;
+    Exit;
 
   FillChar(Reached, MapSize, False);
@@ -1003 +1003 @@
       begin
         Result := MoveResult;
-        break;
+        Break;
       end;
     end;
@@ -1016 +1016 @@
 procedure TToolAI.SeaTransport_BeginInitialize;
 begin
-  fillchar(TransportAvailable, RO.nUn * sizeof(integer), $FF); // -1
+  FillChar(TransportAvailable, RO.nUn * SizeOf(Integer), $FF); // -1
   InitComplete := False;
   HaveDestinations := False;
@@ -1025 +1025 @@
 end;
 
-procedure TToolAI.SeaTransport_AddLoad(uix: integer);
-var
-  i: integer;
-begin
-  assert(not InitComplete); // call order violation!
+procedure TToolAI.SeaTransport_AddLoad(uix: Integer);
+var
+  I: Integer;
+begin
+  Assert(not InitComplete); // call order violation!
   if Map[MyUnit[uix].Loc] and fTerrain < fGrass then
-    exit;
-  for i := 0 to nTransportLoad - 1 do
-    if uix = uixTransportLoad[i] then
-      exit;
+    Exit;
+  for I := 0 to nTransportLoad - 1 do
+    if uix = uixTransportLoad[I] then
+      Exit;
   uixTransportLoad[nTransportLoad] := uix;
   Inc(nTransportLoad);
 end;
 
-procedure TToolAI.SeaTransport_AddTransport(uix: integer);
-var
-  MoveStyle: integer;
-begin
-  assert(not InitComplete); // call order violation!
-  assert(MyModel[MyUnit[uix].mix].Cap[mcSeaTrans] > 0);
+procedure TToolAI.SeaTransport_AddTransport(uix: Integer);
+var
+  MoveStyle: Integer;
+begin
+  Assert(not InitComplete); // call order violation!
+  Assert(MyModel[MyUnit[uix].mix].Cap[mcSeaTrans] > 0);
   TransportAvailable[uix] := 1;
   with MyModel[MyUnit[uix].mix] do
@@ -1058 +1058 @@
 end;
 
-procedure TToolAI.SeaTransport_AddDestination(Loc: integer);
-begin
-  assert(not InitComplete); // call order violation!
+procedure TToolAI.SeaTransport_AddDestination(Loc: Integer);
+begin
+  Assert(not InitComplete); // call order violation!
   Pile.Put(Loc, $800);
   HaveDestinations := True;
@@ -1067 +1067 @@
 procedure TToolAI.SeaTransport_EndInitialize;
 var
-  Loc0, Time0, V8, Loc1, ArriveTime, RecoverTurns: integer;
+  Loc0, Time0, V8, Loc1, ArriveTime, RecoverTurns: Integer;
   Adjacent: TVicinity8Loc;
 begin
-  assert(not InitComplete); // call order violation!
+  Assert(not InitComplete); // call order violation!
   InitComplete := True;
   if HaveDestinations then
   begin // calculate TurnsAfterLoad from destination locs
-    fillchar(TurnsAfterLoad, MapSize, $FF); // -1
+    FillChar(TurnsAfterLoad, MapSize, $FF); // -1
     while Pile.Get(Loc0, Time0) do
     begin // search backward
@@ -1100 +1100 @@
 
 function TToolAI.SeaTransport_MakeGroupPlan(
-  var TransportPlan: TGroupTransportPlan): boolean;
-var
-  V8, i, j, iPicked, uix, Loc0, Time0, Loc1, RecoverTurns, MoveStyle,
+  var TransportPlan: TGroupTransportPlan): Boolean;
+var
+  V8, I, J, iPicked, uix, Loc0, Time0, Loc1, RecoverTurns, MoveStyle,
   TurnsLoaded, TurnCount, tuix, tuix1, ArriveTime, TotalDelay,
   BestTotalDelay, GroupCount, BestGroupCount, BestLoadLoc, FullMovementLoc,
-  nSelectedLoad, f, OriginContinent, a, b: integer;
-  CompleteFlag, NotReachedFlag, ContinueUnit: cardinal;
-  IsComplete, ok, IsFirstLoc: boolean;
+  nSelectedLoad, F, OriginContinent, A, B: Integer;
+  CompleteFlag, NotReachedFlag, ContinueUnit: Cardinal;
+  IsComplete, ok, IsFirstLoc: Boolean;
   StartLocPtr, ArrivedEnd: pinteger;
   Adjacent: TVicinity8Loc;
-  uixSelectedLoad: array[0..15] of integer;
-  tuixSelectedLoad: array[0..15] of integer;
-  Arrived: array[0..lxmax * lymax] of cardinal;
+  uixSelectedLoad: array[0..15] of Integer;
+  tuixSelectedLoad: array[0..15] of Integer;
+  Arrived: array[0..lxmax * lymax] of Cardinal;
   ResponsibleTransport: array[0..lxmax * lymax - 1] of smallint;
-  TurnsBeforeLoad: array[0..lxmax * lymax - 1] of shortint;
-  GroupComplete: array[0..lxmax * lymax - 1] of boolean;
-begin
-  assert(InitComplete); // call order violation!
+  TurnsBeforeLoad: array[0..lxmax * lymax - 1] of ShortInt;
+  GroupComplete: array[0..lxmax * lymax - 1] of Boolean;
+begin
+  Assert(InitComplete); // call order violation!
 
   if HaveDestinations and (nTransportLoad > 0) then
@@ -1128 +1128 @@
         for tuix := 0 to nTransportLoad - 1 do
         begin
-          Loc_to_ab(MyUnit[uix].Loc, MyUnit[uixTransportLoad[tuix]].Loc, a, b);
-          if (abs(a) <= 1) and (abs(b) <= 1) then
+          Loc_to_ab(MyUnit[uix].Loc, MyUnit[uixTransportLoad[tuix]].Loc, A, B);
+          if (abs(A) <= 1) and (abs(B) <= 1) then
           begin
-            assert((a <> 0) or (b <> 0));
+            Assert((A <> 0) or (B <> 0));
             Inc(GroupCount);
           end;
@@ -1145 +1145 @@
           for tuix := nTransportLoad - 1 downto 0 do
           begin
-            Loc_to_ab(TransportPlan.LoadLoc, MyUnit[uixTransportLoad[tuix]].Loc, a, b);
-            if (abs(a) <= 1) and (abs(b) <= 1) then
+            Loc_to_ab(TransportPlan.LoadLoc, MyUnit[uixTransportLoad[tuix]].Loc, A, B);
+            if (abs(A) <= 1) and (abs(B) <= 1) then
             begin
               TransportPlan.uixLoad[TransportPlan.nLoad] := uixTransportLoad[tuix];
@@ -1153 +1153 @@
               Inc(TransportPlan.nLoad);
               if TransportPlan.nLoad = TransportCapacity then
-                break;
+                Break;
             end;
           end;
           Result := True;
-          exit;
+          Exit;
         end;
       end;
@@ -1165 +1165 @@
   begin
     // select units from same continent
-    fillchar(Arrived, 4 * nContinent, 0); // misuse Arrived as counter
+    FillChar(Arrived, 4 * nContinent, 0); // misuse Arrived as counter
     for tuix := 0 to nTransportLoad - 1 do
     begin
-      assert(Map[MyUnit[uixTransportLoad[tuix]].Loc] and fTerrain >= fGrass);
-      f := Formation[MyUnit[uixTransportLoad[tuix]].Loc];
-      if f >= 0 then
-        Inc(Arrived[f]);
+      Assert(Map[MyUnit[uixTransportLoad[tuix]].Loc] and fTerrain >= fGrass);
+      F := Formation[MyUnit[uixTransportLoad[tuix]].Loc];
+      if F >= 0 then
+        Inc(Arrived[F]);
     end;
     OriginContinent := 0;
-    for f := 1 to nContinent - 1 do
-      if Arrived[f] > Arrived[OriginContinent] then
-        OriginContinent := f;
+    for F := 1 to nContinent - 1 do
+      if Arrived[F] > Arrived[OriginContinent] then
+        OriginContinent := F;
     nSelectedLoad := 0;
     for tuix := 0 to nTransportLoad - 1 do
@@ -1185 +1185 @@
         Inc(nSelectedLoad);
         if nSelectedLoad = 16 then
-          break;
+          Break;
       end;
 
     Pile.Create(MapSize);
-    fillchar(ResponsibleTransport, MapSize * 2, $FF); // -1
-    fillchar(TurnsBeforeLoad, MapSize, $FF); // -1
+    FillChar(ResponsibleTransport, MapSize * 2, $FF); // -1
+    FillChar(TurnsBeforeLoad, MapSize, $FF); // -1
     ok := False;
     for uix := 0 to RO.nUn - 1 do
@@ -1203 +1203 @@
       Result := False;
       Pile.Free;
-      exit;
+      Exit;
     end;
     while Pile.Get(Loc0, Time0) do
@@ -1224 +1224 @@
     end;
 
-    fillchar(Arrived, MapSize * 4, $55); // set NotReachedFlag for all tiles
-    fillchar(GroupComplete, MapSize, False);
+    FillChar(Arrived, MapSize * 4, $55); // set NotReachedFlag for all tiles
+    FillChar(GroupComplete, MapSize, False);
     BestLoadLoc := -1;
 
@@ -1232 +1232 @@
     begin
       uix := uixSelectedLoad[tuix];
-      if MyUnit[uix].Movement = integer(MyModel[MyUnit[uix].mix].Speed) then
+      if MyUnit[uix].Movement = Integer(MyModel[MyUnit[uix].mix].Speed) then
       begin
         NotReachedFlag := 1 shl (2 * tuix);
@@ -1246 +1246 @@
             if (TurnsBeforeLoad[Loc1] >= 0) and (TurnsAfterLoad[Loc1] >= 0) then
             begin
-              i := 1;
+              I := 1;
               GroupCount := 0;
               for tuix1 := 0 to nSelectedLoad - 1 do
               begin
-                if Arrived[loc1] and i = 0 then
+                if Arrived[loc1] and I = 0 then
                   Inc(GroupCount);
-                i := i shl 2;
+                I := I shl 2;
               end;
-              assert(GroupCount <= TransportCapacity);
+              Assert(GroupCount <= TransportCapacity);
               if (GroupCount = TransportCapacity) or (GroupCount = nSelectedLoad) then
                 GroupComplete[loc1] := True;
@@ -1292 +1292 @@
           begin
             Pile.Put(MyUnit[uix].Loc, $1800 - MyUnit[uix].Movement);
-            if MyUnit[uix].Movement = integer(MyModel[MyUnit[uix].mix].Speed) then
+            if MyUnit[uix].Movement = Integer(MyModel[MyUnit[uix].mix].Speed) then
               FullMovementLoc := MyUnit[uix].Loc;
             // surrounding tiles can be loaded immediately
@@ -1308 +1308 @@
             if StartLocPtr <> ArrivedEnd then
             begin
-              Loc0 := (integer(StartLocPtr) - integer(@Arrived)) shr 2;
+              Loc0 := (Integer(StartLocPtr) - Integer(@Arrived)) shr 2;
               Inc(StartLocPtr);
               Time0 := $800;
@@ -1316 +1316 @@
               if IsFirstLoc then
                 ContinueUnit := ContinueUnit and not (1 shl tuix);
-              break;
+              Break;
             end;
             IsFirstLoc := False;
@@ -1323 +1323 @@
             if not GroupComplete[Loc0] and (Map[Loc0] and fTerrain <> fMountains) then
             begin // check whether group complete -- no mountains because complete flag might be faked there
-              i := 1;
+              I := 1;
               GroupCount := 0;
               for tuix1 := 0 to nSelectedLoad - 1 do
               begin
-                if Arrived[Loc0] and i = 0 then
+                if Arrived[Loc0] and I = 0 then
                   Inc(GroupCount);
-                i := i shl 2;
+                I := I shl 2;
               end;
-              assert(GroupCount <= TransportCapacity);
+              Assert(GroupCount <= TransportCapacity);
               if (GroupCount = TransportCapacity) or (GroupCount = nSelectedLoad) then
                 GroupComplete[Loc0] := True;
@@ -1353 +1353 @@
                 if (TurnsBeforeLoad[Loc1] >= 0) and (TurnsAfterLoad[Loc1] >= 0) then
                 begin
-                  i := 1;
+                  I := 1;
                   GroupCount := 0;
                   for tuix1 := 0 to nSelectedLoad - 1 do
                   begin
-                    if Arrived[loc1] and i = 0 then
+                    if Arrived[loc1] and I = 0 then
                       Inc(GroupCount);
-                    i := i shl 2;
+                    I := I shl 2;
                   end;
-                  assert(GroupCount <= TransportCapacity);
+                  Assert(GroupCount <= TransportCapacity);
                   if (GroupCount = TransportCapacity) or
                     (GroupCount = nSelectedLoad) then
@@ -1436 +1436 @@
         if 1 shl (2 * tuix) and Arrived[BestLoadLoc] = 0 then
         begin
-          assert(uixTransportLoad[tuixSelectedLoad[tuix]] = uixSelectedLoad[tuix]);
+          Assert(uixTransportLoad[tuixSelectedLoad[tuix]] = uixSelectedLoad[tuix]);
           TransportPlan.uixLoad[TransportPlan.nLoad] := uixSelectedLoad[tuix];
           uixTransportLoad[tuixSelectedLoad[tuix]] :=
@@ -1444 +1444 @@
         end;
       Result := True;
-      exit;
+      Exit;
     end;
 
@@ -1451 +1451 @@
     for tuix := nSelectedLoad - 1 downto 0 do
     begin
-      assert(uixTransportLoad[tuixSelectedLoad[tuix]] = uixSelectedLoad[tuix]);
+      Assert(uixTransportLoad[tuixSelectedLoad[tuix]] = uixSelectedLoad[tuix]);
       uixTransportLoad[tuixSelectedLoad[tuix]] :=
         uixTransportLoad[nTransportLoad - 1];
@@ -1464 +1464 @@
 // Misc
 
-function TToolAI.CurrentMStrength(Domain: integer): integer;
-var
-  i: integer;
+function TToolAI.CurrentMStrength(Domain: Integer): Integer;
+var
+  I: Integer;
 begin
   Result := 0;
-  for i := 0 to nUpgrade - 1 do
-    with upgrade[Domain, i] do
+  for I := 0 to nUpgrade - 1 do
+    with upgrade[Domain, I] do
       if (Preq = preNone) or (Preq >= 0) and
         ((RO.Tech[Preq] >= tsApplicable) or (Preq in FutureTech) and
@@ -1486 +1486 @@
 procedure SetAdvancedness;
 var
-  ad, j, Reduction, AgeThreshold: integer;
-  known: array[0..nAdv - 1] of integer;
-
-  procedure MarkPreqs(ad: integer);
+  ad, J, Reduction, AgeThreshold: Integer;
+  known: array[0..nAdv - 1] of Integer;
+
+  procedure MarkPreqs(ad: Integer);
   var
-    i: integer;
+    I: Integer;
   begin
     if known[ad] = 0 then
     begin
       known[ad] := 1;
-      for i := 0 to 2 do
-        if AdvPreq[ad, i] >= 0 then
-          MarkPreqs(AdvPreq[ad, i]);
+      for I := 0 to 2 do
+        if AdvPreq[ad, I] >= 0 then
+          MarkPreqs(AdvPreq[ad, I]);
     end;
   end;
@@ -1508 +1508 @@
     FillChar(known, SizeOf(known), 0);
     MarkPreqs(ad);
-    for j := 0 to nAdv - 1 do
-      if known[j] > 0 then
+    for J := 0 to nAdv - 1 do
+      if known[J] > 0 then
         Inc(Advancedness[ad]);
   end;