Changeset 447 for trunk/AI/StdAI/Barbarina.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/Barbarina.pas (modified) (74 diffs)

trunk/AI/StdAI/Barbarina.pas

@@ -25 +25 @@
 type
   TColonyShipPlan = array[0..nShipPart - 1] of record
-    cixProducing: integer;
-    LocResource: array[0..maxModern - 1] of integer;
-    nLocResource: integer;
-    LocFoundCity: array[0..maxModern - 1] of integer;
-    nLocFoundCity: integer;
+    cixProducing: Integer;
+    LocResource: array[0..maxModern - 1] of Integer;
+    nLocResource: Integer;
+    LocFoundCity: array[0..maxModern - 1] of Integer;
+    nLocFoundCity: Integer;
   end;
 
   TBarbarina = class(TToolAI)
-    constructor Create(Nation: integer); override;
+    constructor Create(Nation: Integer); override;
 
   protected
     ColonyShipPlan: TColonyShipPlan;
-    function Barbarina_GoHidden: boolean; // whether we should prepare for barbarina mode
-    function Barbarina_Go: boolean; // whether we should switch to barbarina mode now
+    function Barbarina_GoHidden: Boolean; // whether we should prepare for barbarina mode
+    function Barbarina_Go: Boolean; // whether we should switch to barbarina mode now
     procedure Barbarina_DoTurn;
     procedure Barbarina_SetCityProduction;
-    function Barbarina_ChooseResearchAdvance: integer;
-    function Barbarina_WantCheckNegotiation(Nation: integer): boolean;
+    function Barbarina_ChooseResearchAdvance: Integer;
+    function Barbarina_WantCheckNegotiation(Nation: Integer): Boolean;
     procedure Barbarina_DoCheckNegotiation;
-    function Barbarina_WantNegotiation(Nation: integer; NegoTime: TNegoTime): boolean;
+    function Barbarina_WantNegotiation(Nation: Integer; NegoTime: TNegoTime): Boolean;
     procedure Barbarina_DoNegotiation;
     procedure MakeColonyShipPlan;
 
   private
-    TurnOfMapAnalysis, Neighbours: integer;
-    ContinentPresence: array[0..maxCOD - 1] of integer;
-    OceanPresence: array[0..maxCOD - 1] of integer;
-    ContinentSize: array[0..maxCOD - 1] of integer;
-    OceanSize: array[0..maxCOD - 1] of integer;
-    mixBest: array[0..nModelCategory - 1] of integer;
+    TurnOfMapAnalysis, Neighbours: Integer;
+    ContinentPresence: array[0..maxCOD - 1] of Integer;
+    OceanPresence: array[0..maxCOD - 1] of Integer;
+    ContinentSize: array[0..maxCOD - 1] of Integer;
+    OceanSize: array[0..maxCOD - 1] of Integer;
+    mixBest: array[0..nModelCategory - 1] of Integer;
     NegoCause: (CancelTreaty);
-    function IsModelAvailable(rmix: integer): boolean;
+    function IsModelAvailable(rmix: Integer): Boolean;
     procedure FindBestModels;
     procedure AnalyzeMap;
-    procedure RateAttack(uix: integer);
-    function DoAttack(uix, AttackLoc: integer): boolean;
-    function ProcessMove(uix: integer): boolean;
+    procedure RateAttack(uix: Integer);
+    function DoAttack(uix, AttackLoc: Integer): Boolean;
+    function ProcessMove(uix: Integer): Boolean;
     procedure AttackAndPatrol;
   end;
@@ -73 +73 @@
 type
   TResearchModel = record
-    Category, Domain, Weight, adStop, FutMStrength: integer;
-    Upgrades: cardinal;
-    Cap: array [0..nFeature - 1] of integer;
+    Category, Domain, Weight, adStop, FutMStrength: Integer;
+    Upgrades: Cardinal;
+    Cap: array [0..nFeature - 1] of Integer;
   end;
 
@@ -93 +93 @@
 
   nResearchOrder = 40;
-  ResearchOrder: array[0..nResearchOrder - 1] of integer =
+  ResearchOrder: array[0..nResearchOrder - 1] of Integer =
     (adBronzeWorking, -adMapMaking, adChivalry, adMonotheism, adIronWorking,
     adGunPowder, adTheology, adConstruction, adCodeOfLaws, -adEngineering,
@@ -171 +171 @@
 
 var
-  Moved: array[0..numax - 1] of boolean;
-  UnitPresence: array[0..lxmax * lymax - 1] of byte;
+  Moved: array[0..numax - 1] of Boolean;
+  UnitPresence: array[0..lxmax * lymax - 1] of Byte;
   euixMap: array[0..lxmax * lymax - 1] of smallint;
   uixAttack: array[0..neumax - 1] of smallint;
-  AttackScore: array[0..neumax - 1] of integer;
-
-constructor TBarbarina.Create(Nation: integer);
+  AttackScore: array[0..neumax - 1] of Integer;
+
+constructor TBarbarina.Create(Nation: Integer);
 begin
   inherited;
@@ -184 +184 @@
 
 // whether one of the existing models matches a specific research model
-function TBarbarina.IsModelAvailable(rmix: integer): boolean;
+function TBarbarina.IsModelAvailable(rmix: Integer): Boolean;
 var
-  i, mix, MStrength: integer;
+  I, mix, MStrength: Integer;
 begin
   Result := False;
@@ -199 +199 @@
         Result := MStrength < (MyModel[mix].MStrength * 3) div 2;
         // for future techs: don't count model available if 50% stronger possible
-        for i := 0 to nFeature - 1 do
-          if MyModel[mix].Cap[i] < Cap[i] then
+        for I := 0 to nFeature - 1 do
+          if MyModel[mix].Cap[I] < Cap[I] then
           begin
             Result := False;
-            break;
+            Break;
           end;
         if Result then
-          break;
+          Break;
       end;
   end;
 end;
 
-function TBarbarina.Barbarina_GoHidden: boolean;
+function TBarbarina.Barbarina_GoHidden: Boolean;
 var
-  V21, Loc1, cix: integer;
+  V21, Loc1, cix: Integer;
   Radius: TVicinity21Loc;
 begin
@@ -238 +238 @@
 end;
 
-function TBarbarina.Barbarina_Go: boolean;
+function TBarbarina.Barbarina_Go: Boolean;
 begin
   if IsResearched(adMassProduction) then
@@ -249 +249 @@
     Result := (RO.nCity >= 3) and IsResearched(adMapMaking) and
       IsModelAvailable(EntryModel_Base);
-    exit;
+    Exit;
   end;
   Result := Result and ((RO.nUn >= RO.nCity * 3) or
-    (RO.Wonder[woZeus].EffectiveOwner = me));
+    (RO.Wonder[woZeus].EffectiveOwner = Me));
 end;
 
 procedure TBarbarina.AnalyzeMap;
 var
-  Loc, Loc1, V8, f1, p1, cix: integer;
+  Loc, Loc1, V8, f1, p1, cix: Integer;
   Adjacent: TVicinity8Loc;
 begin
   if TurnOfMapAnalysis = RO.Turn then
-    exit;
+    Exit;
 
   // inherited;
 
   // collect nation presence information for continents and oceans
-  fillchar(ContinentPresence, sizeof(ContinentPresence), 0);
-  fillchar(OceanPresence, sizeof(OceanPresence), 0);
-  fillchar(ContinentSize, sizeof(ContinentSize), 0);
-  fillchar(OceanSize, sizeof(OceanSize), 0);
+  FillChar(ContinentPresence, SizeOf(ContinentPresence), 0);
+  FillChar(OceanPresence, SizeOf(OceanPresence), 0);
+  FillChar(ContinentSize, SizeOf(ContinentSize), 0);
+  FillChar(OceanSize, SizeOf(OceanSize), 0);
   for Loc := 0 to MapSize - 1 do
   begin
@@ -339 +339 @@
 procedure TBarbarina.FindBestModels;
 var
-  i, mix, rmix, cat: integer;
+  I, mix, rmix, cat: Integer;
 begin
-  for i := 0 to nModelCategory - 1 do
-    mixBest[i] := -1;
+  for I := 0 to nModelCategory - 1 do
+    mixBest[I] := -1;
   for rmix := nResearchModel - 1 downto 0 do
     with ResearchModel[rmix] do
@@ -351 +351 @@
           begin
             mixBest[Category] := mix;
-            for i := 0 to nFeature - 1 do
-              if MyModel[mix].Cap[i] < Cap[i] then
+            for I := 0 to nFeature - 1 do
+              if MyModel[mix].Cap[I] < Cap[I] then
               begin
                 mixBest[Category] := -1;
-                break;
+                Break;
               end;
             if mixBest[Category] >= 0 then
-              break;
+              Break;
           end;
   for mix := 3 to RO.nModel - 1 do
@@ -387 +387 @@
       begin
         mixBest[ctSeaTrans] := mix;
-        break;
+        Break;
       end;
 end;
@@ -406 +406 @@
 
 // find one unit to destroy each known enemy unit, result in uixAttack
-procedure TBarbarina.RateAttack(uix: integer);
+procedure TBarbarina.RateAttack(uix: Integer);
 var
   MoveStyle, TestLoc, TestTime, NextLoc, NextTime, V8, RemHealth,
-  RecoverTurns, Score, BestScore, euixBest, uixOld: integer;
-  NextTile: cardinal;
+  RecoverTurns, Score, BestScore, euixBest, uixOld: Integer;
+  NextTile: Cardinal;
   Adjacent: TVicinity8Loc;
   Defense: ^TUnitInfo;
-  Reached: array[0..lxmax * lymax - 1] of boolean;
+  Reached: array[0..lxmax * lymax - 1] of Boolean;
 begin
   with MyUnit[uix] do
@@ -419 +419 @@
     begin
       BestScore := 0;
-      fillchar(Reached, MapSize, False);
+      FillChar(Reached, MapSize, False);
       MoveStyle := GetMyMoveStyle(mix, Health);
       Pile.Create(MapSize);
@@ -494 +494 @@
 end;
 
-function TBarbarina.DoAttack(uix, AttackLoc: integer): boolean;
+function TBarbarina.DoAttack(uix, AttackLoc: Integer): Boolean;
   // AttackLoc=maNextCity means bombard only
 var
   MoveResult, Kind, Temp, MoveStyle, TestLoc, TestTime, NextLoc,
-  NextTime, V8, RecoverTurns, ecix: integer;
-  NextTile: cardinal;
-  AttackPositionReached, IsBombardment: boolean;
+  NextTime, V8, RecoverTurns, ecix: Integer;
+  NextTile: Cardinal;
+  AttackPositionReached, IsBombardment: Boolean;
   Adjacent: TVicinity8Loc;
-  PreLoc: array[0..lxmax * lymax - 1] of word;
-  Reached: array[0..lxmax * lymax - 1] of boolean;
+  PreLoc: array[0..lxmax * lymax - 1] of Word;
+  Reached: array[0..lxmax * lymax - 1] of Boolean;
 begin
   Result := False;
@@ -516 +516 @@
     else
       Kind := 0;
-    fillchar(Reached, MapSize, False);
+    FillChar(Reached, MapSize, False);
     AttackPositionReached := False;
     MoveStyle := GetMyMoveStyle(mix, Health);
@@ -524 +524 @@
     begin
       if (TestTime >= $800) or (AttackLoc = maNextCity) and (TestTime > $800 - 100) then
-        break;
+        Break;
       Reached[TestLoc] := True;
       V8_to_Loc(TestLoc, Adjacent);
@@ -537 +537 @@
           begin
             City_FindEnemyCity(NextLoc, ecix);
-            assert(ecix >= 0);
+            Assert(ecix >= 0);
             with RO.EnemyCity[ecix] do
               if (Size > 2) and (Flags and ciCoastalFort = 0) then
@@ -547 +547 @@
           begin
             AttackPositionReached := True;
-            break;
+            Break;
           end
           else if not Reached[NextLoc] then
@@ -572 +572 @@
       begin
         PreLoc[NextLoc] := TestLoc;
-        break;
+        Break;
       end;
     end;
     Pile.Free;
     if not AttackPositionReached then
-      exit;
+      Exit;
 
     TestLoc := AttackLoc;
@@ -601 +601 @@
     begin
       City_FindEnemyCity(AttackLoc, ecix);
-      assert(ecix >= 0);
+      Assert(ecix >= 0);
       while (Movement >= 100) and (RO.EnemyCity[ecix].Size > 2) do
         Unit_Step(uix, AttackLoc);
@@ -611 +611 @@
 end;
 
-function TBarbarina.ProcessMove(uix: integer): boolean;
+function TBarbarina.ProcessMove(uix: Integer): Boolean;
   // return true if no new enemy spotted
 const
@@ -618 +618 @@
   PatrolScore, BestCount, PatrolLoc, TestLoc, NextLoc, TestTime, V8,
   TestScore, MoveResult, MoveStyle, NextTime, TerrOwner, Kind, Temp,
-  RecoverTurns, MaxScore: integer;
-  Tile, NextTile: cardinal;
-  CaptureOnly, PeaceBorder, done, NextToEnemyCity: boolean;
+  RecoverTurns, MaxScore: Integer;
+  Tile, NextTile: Cardinal;
+  CaptureOnly, PeaceBorder, done, NextToEnemyCity: Boolean;
   Adjacent: TVicinity8Loc;
-  AdjacentUnknown: array[0..lxmax * lymax - 1] of shortint;
-  PreLoc: array[0..lxmax * lymax - 1] of word;
-  MoreTurn: array[0..lxmax * lymax - 1] of byte;
+  AdjacentUnknown: array[0..lxmax * lymax - 1] of ShortInt;
+  PreLoc: array[0..lxmax * lymax - 1] of Word;
+  MoreTurn: array[0..lxmax * lymax - 1] of Byte;
 
 begin
@@ -637 +637 @@
         if Map[Loc] and fCity = 0 then
           Unit_MoveEx(uix, maNextCity);
-        exit;
+        Exit;
       end;
 
@@ -666 +666 @@
           // assume a score of $400 is the best achievable
           or CaptureOnly and (TestTime >= $1000) then
-          break;
+          Break;
 
         TestScore := 0;
         Tile := Map[TestLoc];
-        assert(Tile and (fUnit or fOwned) <> fUnit);
+        Assert(Tile and (fUnit or fOwned) <> fUnit);
         TerrOwner := RO.Territory[TestLoc];
         AdjacentUnknown[TestLoc] := 0;
@@ -743 +743 @@
               TestScore := $400 - 14
             else if AdjacentUnknown[TestLoc] > 0 then
-              if PeaceBorder or (TerrOwner >= 0) and (TerrOwner <> me) and
+              if PeaceBorder or (TerrOwner >= 0) and (TerrOwner <> Me) and
                 (RO.Treaty[TerrOwner] < trPeace) then
                 TestScore := $400 - 32 + AdjacentUnknown[TestLoc]
@@ -790 +790 @@
         end;
         if PatrolLoc = Loc then
-          exit;
+          Exit;
         TestLoc := PatrolLoc;
         NextLoc := PreLoc[TestLoc];
@@ -814 +814 @@
             Result := MoveResult and rEnemySpotted = 0;
             done := True;
-            break;
-          end;
-          assert(Loc = NextLoc);
+            Break;
+          end;
+          Assert(Loc = NextLoc);
         end;
         if Loc >= 0 then
@@ -839 +839 @@
   procedure SetCityDefenders;
   var
-    uix, cix, V8, Loc1, Best, uixBest, det: integer;
+    uix, cix, V8, Loc1, Best, uixBest, det: Integer;
     Adjacent: TVicinity8Loc;
-    IsPort: boolean;
+    IsPort: Boolean;
   begin
     for cix := 0 to RO.nCity - 1 do
@@ -887 +887 @@
   procedure ProcessSeaTransport;
   var
-    i, f, uix, Loc1, a, b: integer;
-    ready, go: boolean;
+    I, F, uix, Loc1, A, B: Integer;
+    ready, go: Boolean;
     TransportPlan: TGroupTransportPlan;
   begin
     go := False;
-    for f := 0 to maxCOD - 1 do
-      if (f < nContinent) and (ContinentPresence[f] and not
-        (1 shl me or PresenceUnknown) <> 0) then
+    for F := 0 to maxCOD - 1 do
+      if (F < nContinent) and (ContinentPresence[F] and not
+        (1 shl Me or PresenceUnknown) <> 0) then
         go := True; // any enemy island known?
     if not go then
-      exit;
+      Exit;
 
     SeaTransport_BeginInitialize;
@@ -907 +907 @@
             (MyModel[mix].Attack > 0) and (Map[Loc] and fTerrain >= fGrass) then
           begin
-            f := Formation[Loc];
-            if (f >= 0) and (f < maxCOD) and (ContinentPresence[f] and
-              not (1 shl me) = 0) then
+            F := Formation[Loc];
+            if (F >= 0) and (F < maxCOD) and (ContinentPresence[F] and
+              not (1 shl Me) = 0) then
             begin
               go := True;
@@ -932 +932 @@
         if Map[Loc1] and fTerrain >= fGrass then
         begin
-          f := Formation[Loc1];
-          if (f >= 0) and (f < maxCOD) and (ContinentPresence[f] and
-            not (1 shl me or PresenceUnknown) <> 0) then
+          F := Formation[Loc1];
+          if (F >= 0) and (F < maxCOD) and (ContinentPresence[F] and
+            not (1 shl Me or PresenceUnknown) <> 0) then
             SeaTransport_AddDestination(Loc1);
         end;
@@ -948 +948 @@
       end;
       if ready then
-        for i := 0 to TransportPlan.nLoad - 1 do
+        for I := 0 to TransportPlan.nLoad - 1 do
         begin
           Loc_to_ab(TransportPlan.LoadLoc,
-            MyUnit[TransportPlan.uixLoad[i]].Loc, a, b);
-          ready := ready and (abs(a) <= 1) and (abs(b) <= 1);
+            MyUnit[TransportPlan.uixLoad[I]].Loc, A, B);
+          ready := ready and (abs(A) <= 1) and (abs(B) <= 1);
         end;
       if ready then
       begin
-        for i := 0 to TransportPlan.nLoad - 1 do
-        begin
-          Unit_Step(TransportPlan.uixLoad[i], TransportPlan.LoadLoc);
-          Moved[TransportPlan.uixLoad[i]] := True;
+        for I := 0 to TransportPlan.nLoad - 1 do
+        begin
+          Unit_Step(TransportPlan.uixLoad[I], TransportPlan.LoadLoc);
+          Moved[TransportPlan.uixLoad[I]] := True;
         end;
       end
       else
       begin
-        for i := 0 to TransportPlan.nLoad - 1 do
-        begin
-          Unit_MoveEx(TransportPlan.uixLoad[i], TransportPlan.LoadLoc, mxAdjacent);
-          Moved[TransportPlan.uixLoad[i]] := True;
+        for I := 0 to TransportPlan.nLoad - 1 do
+        begin
+          Unit_MoveEx(TransportPlan.uixLoad[I], TransportPlan.LoadLoc, mxAdjacent);
+          Moved[TransportPlan.uixLoad[I]] := True;
         end;
       end;
@@ -973 +973 @@
   end;
 
-  procedure ProcessUnload(uix: integer);
-
-    procedure Unload(Kind, ToLoc: integer);
+  procedure ProcessUnload(uix: Integer);
+
+    procedure Unload(Kind, ToLoc: Integer);
     var
-      uix1: integer;
+      uix1: Integer;
     begin
       for uix1 := 0 to RO.nUn - 1 do
@@ -987 +987 @@
             Unit_Step(uix1, ToLoc);
             UnitPresence[ToLoc] := UnitPresence[ToLoc] or Kind;
-            break;
+            Break;
           end;
     end;
@@ -993 +993 @@
   var
     uix1, MoveStyle, TestLoc, TestTime, NextLoc, NextTime, V8,
-    RecoverTurns, nSlow, nFast, SlowUnloadLoc, FastUnloadLoc, EndLoc, f: integer;
-    NextTile: cardinal;
+    RecoverTurns, nSlow, nFast, SlowUnloadLoc, FastUnloadLoc, EndLoc, F: Integer;
+    NextTile: Cardinal;
     Adjacent: TVicinity8Loc;
-    Reached: array[0..lxmax * lymax - 1] of boolean;
+    Reached: array[0..lxmax * lymax - 1] of Boolean;
   begin
     // inventory
@@ -1017 +1017 @@
         FastUnloadLoc := -1;
         EndLoc := -1;
-        fillchar(Reached, MapSize, False);
+        FillChar(Reached, MapSize, False);
         Pile.Create(MapSize);
         Pile.Put(Loc, $800 - Movement);
@@ -1034 +1034 @@
               else if NextTile and fTerrain >= fGrass then
               begin
-                f := Formation[NextLoc];
-                if (f >= 0) and (f < maxCOD) and
-                  (ContinentPresence[f] and not (1 shl me or PresenceUnknown) <> 0) and
+                F := Formation[NextLoc];
+                if (F >= 0) and (F < maxCOD) and
+                  (ContinentPresence[F] and not (1 shl Me or PresenceUnknown) <> 0) and
                   (NextTile and (fUnit or fOwned) <> fUnit) then
                 begin
@@ -1074 +1074 @@
 
         if EndLoc < 0 then
-          exit;
+          Exit;
         if Loc <> EndLoc then
           Unit_MoveEx(uix, EndLoc);
         if Loc <> EndLoc then
-          exit;
+          Exit;
         if SlowUnloadLoc >= 0 then
         begin
@@ -1092 +1092 @@
         begin
           Moved[uix] := False;
-          exit;
+          Exit;
         end
       until False;
@@ -1099 +1099 @@
 
 var
-  uix, euix, Kind, euixBest, AttackLoc: integer;
-  OldTile: cardinal;
-  BackToStart, FirstLoop: boolean;
+  uix, euix, Kind, euixBest, AttackLoc: Integer;
+  OldTile: Cardinal;
+  BackToStart, FirstLoop: Boolean;
 begin
-  fillchar(UnitPresence, MapSize, 0);
+  FillChar(UnitPresence, MapSize, 0);
   for uix := 0 to RO.nUn - 1 do
     with MyUnit[uix] do
@@ -1116 +1116 @@
       end;
 
-  fillchar(Moved, RO.nUn, False);
+  FillChar(Moved, RO.nUn, False);
   for uix := 0 to RO.nUn - 1 do
     if (MyUnit[uix].Master >= 0) or (MyUnit[uix].TroopLoad > 0) then
@@ -1128 +1128 @@
       if RO.nEnemyUn > 0 then
       begin
-        fillchar(euixMap, MapSize * 2, $FF);
-        fillchar(AttackScore, RO.nEnemyUn * 4, 0);
+        FillChar(euixMap, MapSize * 2, $FF);
+        FillChar(AttackScore, RO.nEnemyUn * 4, 0);
         for euix := 0 to RO.nEnemyUn - 1 do
           with RO.EnemyUn[euix] do
@@ -1140 +1140 @@
       end;
       if not BackToStart then
-        break;
+        Break;
 
       for uix := 0 to RO.nUn - 1 do
@@ -1155 +1155 @@
             euixBest := euix;
         if euixBest < 0 then
-          break;
+          Break;
         uix := uixAttack[euixBest];
         AttackLoc := RO.EnemyUn[euixBest].Loc;
@@ -1202 +1202 @@
             begin
               BackToStart := True;
-              break;
+              Break;
             end
   until not BackToStart;
@@ -1214 +1214 @@
     1 shl woMagellan + 1 shl woEiffel + 1 shl woLiberty + 1 shl woShinkansen;
 
-  function LowPriority(cix: integer): boolean;
+  function LowPriority(cix: Integer): Boolean;
   var
-    part, cixHighPriority, TestDistance: integer;
+    part, cixHighPriority, TestDistance: Integer;
   begin
     Result := False;
@@ -1228 +1228 @@
         begin
           Result := True;
-          exit;
+          Exit;
         end;
       end;
@@ -1234 +1234 @@
   end;
 
-  function ChooseWonderToBuild(WonderAvailable: integer; AllowCoastal: boolean): integer;
+  function ChooseWonderToBuild(WonderAvailable: Integer; AllowCoastal: Boolean): Integer;
   var
-    Count, iix: integer;
+    Count, iix: Integer;
   begin
     if (WonderAvailable and PrimeWonder > 0) and (AllowCoastal or
@@ -1267 +1267 @@
       begin
         Result := iix;
-        exit;
+        Exit;
       end;
     end;
@@ -1273 +1273 @@
 
 var
-  i, iix, cix, mix, uix, mixProduce, mixShip, V8, V21, Loc1, TotalPop,
-  AlonePop, f, f1, nTownGuard, ShipPart, ProduceShipPart, TestDistance,
-  part, WonderAvailable, WonderInWork, cixNewCapital, Center, Score, BestScore: integer;
-  mixCount: array[0..nmmax - 1] of integer;
+  I, iix, cix, mix, uix, mixProduce, mixShip, V8, V21, Loc1, TotalPop,
+  AlonePop, F, f1, nTownGuard, ShipPart, ProduceShipPart, TestDistance,
+  part, WonderAvailable, WonderInWork, cixNewCapital, Center, Score, BestScore: Integer;
+  mixCount: array[0..nmmax - 1] of Integer;
   //RareLoc: array[0..5] of integer;
   Adjacent: TVicinity8Loc;
   IsCoastal, IsPort, IsUnitProjectObsolete, HasSettler, SpezializeShipProduction,
   AlgaeAvailable, ProjectComplete, DoLowPriority, WillProduceColonyShip,
-  ImportantCity: boolean;
+  ImportantCity: Boolean;
   Radius: TVicinity21Loc;
   Report: TCityReportNew;
@@ -1289 +1289 @@
   FindBestModels;
 
-  fillchar(mixCount, RO.nModel * 4, 0);
+  FillChar(mixCount, RO.nModel * 4, 0);
   for uix := 0 to RO.nUn - 1 do
     with MyUnit[uix] do
@@ -1317 +1317 @@
       begin
         Inc(TotalPop, Size);
-        f := Formation[Loc];
-        if (f < 0) or (f >= maxCOD) or (ContinentPresence[f] = 1 shl me) then
+        F := Formation[Loc];
+        if (F < 0) or (F >= maxCOD) or (ContinentPresence[F] = 1 shl Me) then
           Inc(AlonePop, Size);
       end;
@@ -1358 +1358 @@
               if (f1 >= 0) and (f1 < maxCOD) and
                 ((OceanSize[f1] >= 8) or (OceanPresence[f1] and not
-                (1 shl me) <> 0)) then
+                (1 shl Me) <> 0)) then
               begin // prefer non-coastal cities
                 Dec(Score, 18);
-                break;
+                Break;
               end;
             end;
@@ -1390 +1390 @@
           (LowPriority(cix) = DoLowPriority) then
         begin
-          f := Formation[Loc];
+          F := Formation[Loc];
           IsCoastal := False;
           IsPort := False;
@@ -1402 +1402 @@
               f1 := Formation[Loc1];
               if (f1 >= 0) and (f1 < maxCOD) and (OceanSize[f1] >= 8) and
-                (OceanPresence[f1] and not (1 shl me) <> 0) then
+                (OceanPresence[f1] and not (1 shl Me) <> 0) then
               begin
                 IsPort := True;
-                break;
+                Break;
               end;
             end;
@@ -1412 +1412 @@
             (RO.Model[City_CurrentUnitProject(cix)].Kind <> mkSettler) then
           begin
-            i := nModelCategory - 1;
-            while (i >= 0) and (City_CurrentUnitProject(cix) <> mixBest[i]) do
-              Dec(i);
-            IsUnitProjectObsolete := i < 0;
+            I := nModelCategory - 1;
+            while (I >= 0) and (City_CurrentUnitProject(cix) <> mixBest[I]) do
+              Dec(I);
+            IsUnitProjectObsolete := I < 0;
           end
           else
@@ -1581 +1581 @@
               City_StartImprovement(cix,imMissileBat)}
                 else if IsPort and (not SpezializeShipProduction or
-                  (f < 0) or (f >= maxCOD) or (ContinentPresence[f] = 1 shl me)) and
+                  (F < 0) or (F >= maxCOD) or (ContinentPresence[F] = 1 shl Me)) and
                   (Built[imDockyard] = 0) and City_Improvable(cix, imDockyard) then
                   City_StartImprovement(cix, imDockyard)
                 else if IsPort and (mixShip >= 0) and
-                  (not SpezializeShipProduction or (f < 0) or
-                  (f >= maxCOD) or (ContinentPresence[f] = 1 shl me)) then
+                  (not SpezializeShipProduction or (F < 0) or
+                  (F >= maxCOD) or (ContinentPresence[F] = 1 shl Me)) then
                   City_StartUnitProduction(cix, mixShip)
                 else if (Built[imBarracks] + Built[imMilAcademy] = 0) and
@@ -1600 +1600 @@
           if (City_CurrentImprovementProject(cix) = imCourt) and
             (Built[imTownHall] > 0) and (prod >= imp[imCourt].cost *
-            BuildCostMod[G.Difficulty[me]] div 12 -
-            (imp[imTownHall].cost * BuildCostMod[G.Difficulty[me]] div 12) *
+            BuildCostMod[G.Difficulty[Me]] div 12 -
+            (imp[imTownHall].cost * BuildCostMod[G.Difficulty[Me]] div 12) *
             2 div 3) then
             City_RebuildImprovement(cix, imTownHall)
@@ -1614 +1614 @@
                 if City_RebuildImprovement(cix, iix) < rExecuted then
                   City_SellImprovement(cix, iix);
-                break;
+                Break;
               end;
         end;
 end;
 
-function TBarbarina.Barbarina_ChooseResearchAdvance: integer;
+function TBarbarina.Barbarina_ChooseResearchAdvance: Integer;
 var
-  nPreq, rmix, rmixChosen, i, MaxWeight, MaxDefense, ChosenPreq: integer;
-  NeedSeaUnits, ready: boolean;
+  nPreq, rmix, rmixChosen, I, MaxWeight, MaxDefense, ChosenPreq: Integer;
+  NeedSeaUnits, ready: Boolean;
   ModelExists: set of 0..nModelCategory - 1;
-  known: array[0..nAdv - 1] of integer;
-
-  procedure ChoosePreq(ad: integer);
+  known: array[0..nAdv - 1] of Integer;
+
+  procedure ChoosePreq(ad: Integer);
   var
-    i: integer;
-    PreqOk: boolean;
+    I: Integer;
+    PreqOk: Boolean;
   begin
-    assert(RO.Tech[ad] < tsApplicable);
+    Assert(RO.Tech[ad] < tsApplicable);
     if known[ad] = 0 then
     begin
@@ -1637 +1637 @@
       PreqOk := True;
       if not (ad in [adScience, adMassProduction]) and (RO.Tech[ad] < tsSeen) then
-        for i := 0 to 1 do
-          if (AdvPreq[ad, i] >= 0) and (RO.Tech[AdvPreq[ad, i]] < tsApplicable) then
+        for I := 0 to 1 do
+          if (AdvPreq[ad, I] >= 0) and (RO.Tech[AdvPreq[ad, I]] < tsApplicable) then
           begin
             PreqOk := False;
-            ChoosePreq(AdvPreq[ad, i]);
+            ChoosePreq(AdvPreq[ad, I]);
           end;
       if PreqOk then
@@ -1697 +1697 @@
         ready := (MaxWeight >= Weight) and (MaxDefense >= Cap[mcDefense]);
         if ready then
-          for i := 0 to nFeature - 1 do
-            if (Cap[i] > 0) and (Feature[i].Preq <> preNone) and
-              ((Feature[i].Preq < 0) or not IsResearched(Feature[i].Preq)) then
+          for I := 0 to nFeature - 1 do
+            if (Cap[I] > 0) and (Feature[I].Preq <> preNone) and
+              ((Feature[I].Preq < 0) or not IsResearched(Feature[I].Preq)) then
               ready := False;
         if ready then
         begin
-          for i := 0 to nUpgrade - 1 do
-            if (Upgrades and (1 shl i) <> 0) and not
-              IsResearched(Upgrade[Domain, i].Preq) then
+          for I := 0 to nUpgrade - 1 do
+            if (Upgrades and (1 shl I) <> 0) and not
+              IsResearched(Upgrade[Domain, I].Preq) then
               ready := False;
         end;
         if ready then
         begin
-          include(ModelExists, Category);
+          Include(ModelExists, Category);
           if not IsModelAvailable(rmix) then
             rmixChosen := rmix;
@@ -1719 +1719 @@
     begin
       PrepareNewModel(Domain);
-      for i := 0 to nFeature - 1 do
-        if (i < 2) or (Cap[i] > 0) then
-          SetNewModelFeature(i, Cap[i]);
-      if RO.Wonder[woSun].EffectiveOwner = me then
+      for I := 0 to nFeature - 1 do
+        if (I < 2) or (Cap[I] > 0) then
+          SetNewModelFeature(I, Cap[I]);
+      if RO.Wonder[woSun].EffectiveOwner = Me then
       begin
         //if Cap[mcWeapons]>=2*Cap[mcArmor] then
@@ -1730 +1730 @@
       end;
       Result := adMilitary;
-      exit;
+      Exit;
     end;
 
   NeedSeaUnits := True;
-  i := 0;
-  while (i < nResearchOrder) and (not NeedSeaUnits and (ResearchOrder[i] < 0) or
-      IsResearched(abs(ResearchOrder[i]))) do
-    Inc(i);
-  if i >= nResearchOrder then // list done, continue with future tech
+  I := 0;
+  while (I < nResearchOrder) and (not NeedSeaUnits and (ResearchOrder[I] < 0) or
+      IsResearched(abs(ResearchOrder[I]))) do
+    Inc(I);
+  if I >= nResearchOrder then // list done, continue with future tech
   begin
     if random(2) = 1 then
@@ -1750 +1750 @@
     nPreq := 0;
     ChosenPreq := -1;
-    ChoosePreq(abs(ResearchOrder[i]));
-    assert(nPreq > 0);
+    ChoosePreq(abs(ResearchOrder[I]));
+    Assert(nPreq > 0);
     Result := ChosenPreq;
   end;
 end;
 
-function TBarbarina.Barbarina_WantCheckNegotiation(Nation: integer): boolean;
+function TBarbarina.Barbarina_WantCheckNegotiation(Nation: Integer): Boolean;
 begin
   if (RO.Tech[adTheRepublic] < tsSeen) and (RO.Tech[adTheology] >= tsApplicable) and
@@ -1769 +1769 @@
 begin
   if RO.Tech[adTheRepublic] >= tsSeen then
-    exit; // default reaction
+    Exit; // default reaction
   if MyLastAction = scContact then
   begin
@@ -1797 +1797 @@
 end;
 
-function TBarbarina.Barbarina_WantNegotiation(Nation: integer;
-  NegoTime: TNegoTime): boolean;
+function TBarbarina.Barbarina_WantNegotiation(Nation: Integer;
+  NegoTime: TNegoTime): Boolean;
 var
-  uix, TestLoc, V8: integer;
+  uix, TestLoc, V8: Integer;
   Adjacent: TVicinity8Loc;
 begin
@@ -1812 +1812 @@
       if RO.Turn >= RO.LastCancelTreaty[Nation] + CancelTreatyTurns then
       begin
-        if (RO.Turn and 3 = (Nation + $F - me) and 3) and
+        if (RO.Turn and 3 = (Nation + $F - Me) and 3) and
           (RO.Treaty[Nation] > trPeace) then
         begin
@@ -1838 +1838 @@
                     NegoCause := CancelTreaty;
                     Result := True;
-                    exit;
+                    Exit;
                   end;
                 end;
@@ -1858 +1858 @@
 procedure TBarbarina.MakeColonyShipPlan;
 var
-  i, V21, V21C, CityLoc, Loc1, part, cix, BestValue, TestValue, FoodCount,
-  ProdCount, ProdExtra, Score, BestScore: integer;
-  Tile: cardinal;
-  ok, check: boolean;
+  I, V21, V21C, CityLoc, Loc1, part, cix, BestValue, TestValue, FoodCount,
+  ProdCount, ProdExtra, Score, BestScore: Integer;
+  Tile: Cardinal;
+  ok, check: Boolean;
   Radius, RadiusC: TVicinity21Loc;
 begin
@@ -1887 +1887 @@
               begin
                 part := (Tile and fModern) shr 25 - 1;
-                if RO.Ship[me].Parts[part] < ShipNeed[part] then
+                if RO.Ship[Me].Parts[part] < ShipNeed[part] then
                   // not enough of this kind already
                 begin
@@ -1893 +1893 @@
                   if ColonyShipPlan[part].cixProducing >= 0 then
                   begin // another city is already assigned to this ship part, choose one of the two
-                    TestValue := (ID and $FFF) shl 4 + ((ID shr 12) + 15 - me) and $F;
+                    TestValue := (ID and $FFF) shl 4 + ((ID shr 12) + 15 - Me) and $F;
                     BestValue :=
                       (MyCity[ColonyShipPlan[part].cixProducing].ID and $FFF) shl
                       4 + ((MyCity[ColonyShipPlan[part].cixProducing].ID shr 12) +
-                      15 - me) and $F;
+                      15 - Me) and $F;
                     if TestValue <= BestValue then
                       ok := False;
@@ -1912 +1912 @@
     check := False;
     for part := 0 to nShipPart - 1 do
-      if (RO.Ship[me].Parts[part] < ShipNeed[part]) // not enough of this kind already
+      if (RO.Ship[Me].Parts[part] < ShipNeed[part]) // not enough of this kind already
         and (ColonyShipPlan[part].cixProducing < 0) then // no city to produce
         check := True;
@@ -1931 +1931 @@
       end;
       for part := 0 to nShipPart - 1 do
-        if (RO.Ship[me].Parts[part] < ShipNeed[part]) // not enough of this kind already
+        if (RO.Ship[Me].Parts[part] < ShipNeed[part]) // not enough of this kind already
           and (ColonyShipPlan[part].cixProducing < 0) // no city to produce
           and (ColonyShipPlan[part].nLocResource > 0) then // resource is known
         begin
-          for i := 0 to ColonyShipPlan[part].nLocResource - 1 do
+          for I := 0 to ColonyShipPlan[part].nLocResource - 1 do
           begin
             BestScore := 0;
-            V21_to_Loc(ColonyShipPlan[part].LocResource[i], Radius);
+            V21_to_Loc(ColonyShipPlan[part].LocResource[I], Radius);
             for V21 := 1 to 26 do
             begin // check all potential cities in range
@@ -1984 +1984 @@
                       Dec(ProdCount, 5 - FoodCount);
                     Score := ProdCount * 4 + ProdExtra * 8 + FoodCount;
-                    Score := Score shl 8 + ((CityLoc xor me) * 4567) mod 251;
+                    Score := Score shl 8 + ((CityLoc xor Me) * 4567) mod 251;
                     // some unexactness, random but always the same for this tile
                   end;