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

trunk/AI/StdAI/AI.pas

@@ -23 +23 @@
 
   nResearchOrder = 46;
-  ResearchOrder: array[0..1, 0..nResearchOrder - 1] of integer =
+  ResearchOrder: array[0..1, 0..nResearchOrder - 1] of Integer =
     ((adWheel, adWarriorCode, adHorsebackRiding, adCeremonialBurial, adPolytheism,
     adMonarchy, adMysticism, adPoetry, adAstronomy, adMonotheism,
@@ -76 +76 @@
 
   // mil research
-  BetterQuality: array[0..nModelCat - 1] of integer = (50, 50, 80, 80);
+  BetterQuality: array[0..nModelCat - 1] of Integer = (50, 50, 80, 80);
   MaxBuildWorseThanBestModel = 20;
   MaxExistWorseThanBestModel = 50;
@@ -85 +85 @@
   nRequestedTechs = 48;
 
-  PlayerHash: array[0..nPl - 1] of integer =
+  PlayerHash: array[0..nPl - 1] of Integer =
     (7, 6, 0, 2, 10, 8, 12, 14, 4, 1, 3, 5, 9, 11, 13);
 
@@ -92 +92 @@
 
   TPersistentData = record
-    LastResearchTech, BehaviorFlags, TheologyPartner: integer;
+    LastResearchTech, BehaviorFlags, TheologyPartner: Integer;
     RejectTurn: array[Suggestion, 0..15] of smallint;
-    RequestedTechs: array[0..nRequestedTechs - 1] of integer;
+    RequestedTechs: array[0..nRequestedTechs - 1] of Integer;
     // ad + p shl 8 + Turn shl 16
   end;
 
   TAI = class(TBarbarina)
-    constructor Create(Nation: integer); override;
+    constructor Create(Nation: Integer); override;
 
     procedure SetDataDefaults; override;
@@ -106 +106 @@
     Data: ^TPersistentData;
     WarNations, BombardingNations, mixSettlers, mixCaravan, mixTownGuard,
-    mixSlaves, mixMilitia, mixCruiser, OceanWithShip: integer;
+    mixSlaves, mixMilitia, mixCruiser, OceanWithShip: Integer;
     NegoCause: (Routine, CheckBarbarina);
-    SettlerSurplus: array[0..maxCOD - 1] of integer;
-    uixPatrol: array[0..maxCOD - 1] of integer;
-
-    ContinentPresence: array[0..maxCOD - 1] of integer;
-    OceanPresence: array[0..maxCOD - 1] of integer;
-    UnitLack: array[0..maxCOD - 1, mctGroundDefender..mctGroundAttacker] of integer;
-
-    TotalPopulation: array[0..nPl - 1] of integer;
-    ContinentPopulation: array[0..nPl - 1, 0..maxCOD - 1] of integer;
+    SettlerSurplus: array[0..maxCOD - 1] of Integer;
+    uixPatrol: array[0..maxCOD - 1] of Integer;
+
+    ContinentPresence: array[0..maxCOD - 1] of Integer;
+    OceanPresence: array[0..maxCOD - 1] of Integer;
+    UnitLack: array[0..maxCOD - 1, mctGroundDefender..mctGroundAttacker] of Integer;
+
+    TotalPopulation: array[0..nPl - 1] of Integer;
+    ContinentPopulation: array[0..nPl - 1, 0..maxCOD - 1] of Integer;
     // 1 means enemy territory spotted but no city
-    DistrictPopulation: array[0..maxCOD - 1] of integer;
-
-    ModelCat: array[0..nMmax - 1] of integer;
-    ModelQuality: array[0..nMmax - 1] of integer;
-    ModelBestQuality: array[0..nModelCat - 1] of integer;
-
-    AdvanceValue: array[0..nAdv - 1] of integer;
-    AdvanceValuesSet: boolean;
+    DistrictPopulation: array[0..maxCOD - 1] of Integer;
+
+    ModelCat: array[0..nMmax - 1] of Integer;
+    ModelQuality: array[0..nMmax - 1] of Integer;
+    ModelBestQuality: array[0..nModelCat - 1] of Integer;
+
+    AdvanceValue: array[0..nAdv - 1] of Integer;
+    AdvanceValuesSet: Boolean;
 
     procedure DoTurn; override;
     procedure DoNegotiation; override;
-    function ChooseResearchAdvance: integer; override;
-    function ChooseStealAdvance: integer; override;
-    function ChooseGovernment: integer; override;
-    function WantNegotiation(Nation: integer; NegoTime: TNegoTime): boolean; override;
-    function OnNegoRejected_CancelTreaty: boolean; override;
-
-    procedure FindBestTrade(Nation: integer; var adWanted, adGiveAway: integer);
+    function ChooseResearchAdvance: Integer; override;
+    function ChooseStealAdvance: Integer; override;
+    function ChooseGovernment: Integer; override;
+    function WantNegotiation(Nation: Integer; NegoTime: TNegoTime): Boolean; override;
+    function OnNegoRejected_CancelTreaty: Boolean; override;
+
+    procedure FindBestTrade(Nation: Integer; var adWanted, adGiveAway: Integer);
     procedure CheckGender;
     procedure AnalyzeMap;
@@ -141 +141 @@
     procedure AttackAndPatrol;
     procedure MoveUnitsHome;
-    procedure CheckAttack(uix: integer);
-    procedure Patrol(uix: integer);
+    procedure CheckAttack(uix: Integer);
+    procedure Patrol(uix: Integer);
     procedure SetCityProduction;
     procedure SetAdvanceValues;
-    function HavePort: boolean;
-  {$IFDEF DEBUG}procedure TraceAdvanceValues(Nation: integer);{$ENDIF}
+    function HavePort: Boolean;
+  {$IFDEF DEBUG}procedure TraceAdvanceValues(Nation: Integer);{$ENDIF}
 
     // research
-    procedure RateModel(const mi: TModelInfo; var Category, Quality: integer);
-    procedure RateMyModel(mix: integer; var Category, Quality: integer);
-    function IsBetterModel(const mi: TModelInfo): boolean;
+    procedure RateModel(const mi: TModelInfo; var Category, Quality: Integer);
+    procedure RateMyModel(mix: Integer; var Category, Quality: Integer);
+    function IsBetterModel(const mi: TModelInfo): Boolean;
 
     //terraforming
-    procedure TileWorkPlan(Loc, cix: integer; var Value, NextJob, TotalWork: integer);
+    procedure TileWorkPlan(Loc, cix: Integer; var Value, NextJob, TotalWork: Integer);
     procedure ProcessSettlers;
 
     // diplomacy
-    function MostWanted(Nation, adGiveAway: integer): integer;
+    function MostWanted(Nation, adGiveAway: Integer): Integer;
 
   end;
@@ -174 +174 @@
 
 var
-  LeaveOutValue: array[0..nAdv - 1] of integer;
-
-constructor TAI.Create(Nation: integer);
+  LeaveOutValue: array[0..nAdv - 1] of Integer;
+
+constructor TAI.Create(Nation: Integer);
 begin
   inherited;
-  Data := pointer(RO.Data);
+  Data := Pointer(RO.Data);
 {$IFDEF DEBUG}
   if Nation = 1 then
@@ -192 +192 @@
   begin
     LastResearchTech := -1;
-    if PlayerHash[me] > 7 then
+    if PlayerHash[Me] > 7 then
       BehaviorFlags := bFemale
     else
@@ -198 +198 @@
     DebugMessage(1, 'Gender:=' + char(48 + BehaviorFlags and bGender));
     TheologyPartner := -1;
-    fillchar(RejectTurn, sizeof(RejectTurn), $FF);
-    Fillchar(RequestedTechs, sizeof(RequestedTechs), $FF);
+    FillChar(RejectTurn, SizeOf(RejectTurn), $FF);
+    Fillchar(RequestedTechs, SizeOf(RequestedTechs), $FF);
   end;
 end;
 
-function TAI.OnNegoRejected_CancelTreaty: boolean;
+function TAI.OnNegoRejected_CancelTreaty: Boolean;
 begin
   Data.RejectTurn[suContact, Opponent] := RO.Turn;
@@ -213 +213 @@
 //-------------------------------
 
-procedure TAI.RateModel(const mi: TModelInfo; var Category, Quality: integer);
+procedure TAI.RateModel(const mi: TModelInfo; var Category, Quality: Integer);
 var
-  EffectiveTransport: integer;
+  EffectiveTransport: Integer;
 begin
   if mi.Kind >= mkScout then
   begin
     Category := mctNone;
-    exit;
+    Exit;
   end;
   case mi.Domain of
@@ -292 +292 @@
 end;
 
-procedure TAI.RateMyModel(mix: integer; var Category, Quality: integer);
+procedure TAI.RateMyModel(mix: Integer; var Category, Quality: Integer);
 var
   mi: TModelInfo;
 begin
-  MakeModelInfo(me, mix, MyModel[mix], mi);
+  MakeModelInfo(Me, mix, MyModel[mix], mi);
   RateModel(mi, Category, Quality);
 end;
 
-function TAI.IsBetterModel(const mi: TModelInfo): boolean;
+function TAI.IsBetterModel(const mi: TModelInfo): Boolean;
 var
-  mix, Cat, Quality, Cat1, Quality1: integer;
+  mix, Cat, Quality, Cat1, Quality1: Integer;
 begin
   RateModel(mi, Cat, Quality);
@@ -312 +312 @@
       begin
         Result := False;
-        exit;
+        Exit;
       end;
     end;
@@ -318 +318 @@
 end;
 
-function TAI.ChooseResearchAdvance: integer;
+function TAI.ChooseResearchAdvance: Integer;
 var
-  adNext, iad, i, ad, Count, EarliestNeeded, EarliestNeeded_NoLeaveOut,
-  NewResearch, StateOfArt, mix: integer;
+  adNext, iad, I, ad, Count, EarliestNeeded, EarliestNeeded_NoLeaveOut,
+  NewResearch, StateOfArt, mix: Integer;
   mi: TModelInfo;
-  Entry: array[0..nAdv - 1] of boolean;
-  ok: boolean;
-
-  function MarkEntry(ad: integer): boolean;
+  Entry: array[0..nAdv - 1] of Boolean;
+  ok: Boolean;
+
+  function MarkEntry(ad: Integer): Boolean;
   begin
     if RO.Tech[ad] >= tsApplicable then
@@ -373 +373 @@
   end;
 
-  procedure OptimizeDevModel(OptimizeCaps: integer);
+  procedure OptimizeDevModel(OptimizeCaps: Integer);
   var
-    f, Cat, OriginalCat, Quality, BestQuality, Best: integer;
+    F, Cat, OriginalCat, Quality, BestQuality, Best: Integer;
     mi: TModelInfo;
   begin
-    MakeModelInfo(me, 0, RO.DevModel, mi);
+    MakeModelInfo(Me, 0, RO.DevModel, mi);
     RateModel(mi, OriginalCat, BestQuality);
     repeat
       Best := -1;
-      for f := 0 to nFeature - 1 do
-        if (1 shl f and OptimizeCaps <> 0) and
-          ((Feature[f].Preq < 0) or IsResearched(Feature[f].Preq)) // check prerequisite
-          and (RO.DevModel.Weight + Feature[f].Weight <= RO.DevModel.MaxWeight) and
-          not ((f >= mcFirstNonCap) and (RO.DevModel.Cap[f] > 0)) then
-        begin
-          if SetNewModelFeature(f, RO.DevModel.Cap[f] + 1) >= rExecuted then
+      for F := 0 to nFeature - 1 do
+        if (1 shl F and OptimizeCaps <> 0) and
+          ((Feature[F].Preq < 0) or IsResearched(Feature[F].Preq)) // check prerequisite
+          and (RO.DevModel.Weight + Feature[F].Weight <= RO.DevModel.MaxWeight) and
+          not ((F >= mcFirstNonCap) and (RO.DevModel.Cap[F] > 0)) then
+        begin
+          if SetNewModelFeature(F, RO.DevModel.Cap[F] + 1) >= rExecuted then
           begin
-            MakeModelInfo(me, 0, RO.DevModel, mi);
+            MakeModelInfo(Me, 0, RO.DevModel, mi);
             RateModel(mi, Cat, Quality);
-            assert(Cat = OriginalCat);
+            Assert(Cat = OriginalCat);
             if Quality > BestQuality then
             begin
-              Best := f;
+              Best := F;
               BestQuality := Quality;
             end;
-            SetNewModelFeature(f, RO.DevModel.Cap[f] - 1);
+            SetNewModelFeature(F, RO.DevModel.Cap[F] - 1);
           end;
         end;
@@ -406 +406 @@
   end;
 
-  function LeaveOutsMissing(ad: integer): boolean;
+  function LeaveOutsMissing(ad: Integer): Boolean;
   var
-    i: integer;
+    I: Integer;
   begin
     Result := False;
@@ -422 +422 @@
         Result := True
       else
-        for i := 0 to 1 do
-          if AdvPreq[ad, i] >= 0 then
-            Result := Result or LeaveOutsMissing(AdvPreq[ad, i]);
+        for I := 0 to 1 do
+          if AdvPreq[ad, I] >= 0 then
+            Result := Result or LeaveOutsMissing(AdvPreq[ad, I]);
   end;
 
@@ -432 +432 @@
     Result := Barbarina_ChooseResearchAdvance;
     if Result >= 0 then
-      exit;
+      Exit;
   end;
 
@@ -444 +444 @@
       Result := ad;
   if Result >= 0 then
-    exit;
+    Exit;
 
   if Data.BehaviorFlags and bBarbarina = 0 then
@@ -460 +460 @@
       OptimizeDevModel(1 shl mcOffense + 1 shl mcDefense + 1 shl
         mcMob + 1 shl mcLongRange + 1 shl mcFanatic);
-      MakeModelInfo(me, 0, RO.DevModel, mi);
+      MakeModelInfo(Me, 0, RO.DevModel, mi);
       if IsBetterModel(mi) then
       begin
         Result := adMilitary;
-        exit;
+        Exit;
       end;
 
@@ -471 +471 @@
       SetNewModelFeature(mcOffense, 1);
       OptimizeDevModel(1 shl mcOffense + 1 shl mcDefense + 1 shl mcFanatic);
-      MakeModelInfo(me, 0, RO.DevModel, mi);
+      MakeModelInfo(Me, 0, RO.DevModel, mi);
       if IsBetterModel(mi) then
       begin
         Result := adMilitary;
-        exit;
+        Exit;
       end;
     end;
@@ -491 +491 @@
         SetNewModelFeature(mcWeapons, 0);
         SetNewModelFeature(mcDefense, 3);
-        exit;
+        Exit;
       end;
     end;
@@ -506 +506 @@
       OptimizeDevModel(1 shl mcDefense+1 shl mcSeaTrans+1 shl mcTurbines
         +1 shl mcAirDef);
-      MakeModelInfo(me,0,RO.DevModel,mi);
+      MakeModelInfo(Me,0,RO.DevModel,mi);
       if IsBetterModel(mi) then
-        begin result:=adMilitary; exit end;
+        begin Result:=adMilitary; Exit end;
       end;
 
@@ -519 +519 @@
       OptimizeDevModel(1 shl mcOffense+1 shl mcDefense
         +1 shl mcLongRange+1 shl mcAirDef+1 shl mcRadar);
-      MakeModelInfo(me,0,RO.DevModel,mi);
+      MakeModelInfo(Me,0,RO.DevModel,mi);
       if IsBetterModel(mi) then
-        begin result:=adMilitary; exit end;
+        begin Result:=adMilitary; Exit end;
       end
     end;
@@ -545 +545 @@
         begin
           ok := True;
-          break;
+          Break;
         end;
       if not ok then
@@ -588 +588 @@
         begin // 2 of 3 required
           Count := 0;
-          for i := 0 to 2 do
-            if RO.Tech[AdvPreq[ad, i]] >= tsApplicable then
+          for I := 0 to 2 do
+            if RO.Tech[AdvPreq[ad, I]] >= tsApplicable then
               Inc(Count);
           if Count >= 2 then
           begin
             Result := ad;
-            exit;
+            Exit;
           end;
         end
@@ -602 +602 @@
         begin
           Result := ad;
-          exit;
+          Exit;
         end;
       end;
@@ -618 +618 @@
     begin // go for future techs
       Result := -1;
-      i := 0;
+      I := 0;
       for ad := nAdv - 4 to nAdv - 1 do
         if (RO.Tech[ad] < MaxFutureTech) and (RO.Tech[AdvPreq[ad, 0]] >=
           tsApplicable) then
         begin
-          Inc(i);
-          if random(i) = 0 then
+          Inc(I);
+          if random(I) = 0 then
             Result := ad;
         end;
-      assert((Result < 0) or AdvanceResearchable(Result));
-      exit;
-    end;
-
-  assert(NewResearch >= 0);
-  fillchar(Entry, sizeof(Entry), False);
+      Assert((Result < 0) or AdvanceResearchable(Result));
+      Exit;
+    end;
+
+  Assert(NewResearch >= 0);
+  FillChar(Entry, SizeOf(Entry), False);
   MarkEntry(NewResearch);
   Result := -1;
@@ -638 +638 @@
     if Entry[ad] and ((Result < 0) or (Advancedness[ad] > Advancedness[Result])) then
       Result := ad;
-  assert(Result >= 0);
+  Assert(Result >= 0);
 end;
 
-function TAI.ChooseStealAdvance: integer;
+function TAI.ChooseStealAdvance: Integer;
 var
-  ad: integer;
+  ad: Integer;
 begin
   Result := -1;
@@ -659 +659 @@
   twpAllowFarmland = $0001;
 
-procedure TAI.TileWorkPlan(Loc, cix: integer; var Value, NextJob, TotalWork: integer);
+procedure TAI.TileWorkPlan(Loc, cix: Integer; var Value, NextJob, TotalWork: Integer);
 var
-  OldTile, TerrType: cardinal;
+  OldTile, TerrType: Cardinal;
   TileInfo: TTileInfo;
 begin
@@ -669 +669 @@
   begin
     Value := 3 * 8 - 1;
-    exit;
+    Exit;
   end; // better than any tile with 2 food
 
@@ -690 +690 @@
       Map[Loc] := Map[Loc] and not fTerrain or fGrass;
       TerrType := fGrass;
-      Map[Loc] := Map[Loc] or cardinal(SpecialTile(Loc, TerrType, G.lx) shl 5);
+      Map[Loc] := Map[Loc] or Cardinal(SpecialTile(Loc, TerrType, G.lx) shl 5);
     end
     else if IsResearched(adExplosives) and
@@ -701 +701 @@
       Map[Loc] := Map[Loc] and not fTerrain or fGrass;
       TerrType := fGrass;
-      Map[Loc] := Map[Loc] or cardinal(SpecialTile(Loc, TerrType, G.lx) shl 5);
+      Map[Loc] := Map[Loc] or Cardinal(SpecialTile(Loc, TerrType, G.lx) shl 5);
     end;
     if (Terrain[TerrType].MineEff > 0) and (RO.Government <> gDespotism) then
@@ -764 +764 @@
     end;
   end;
-  Server(sGetTileInfo, me, Loc, TileInfo);
+  Server(sGetTileInfo, Me, Loc, TileInfo);
   Value := TileInfo.Food * 8 + TileInfo.Prod * 2 + TileInfo.Trade;
   Map[Loc] := OldTile;
@@ -772 +772 @@
 procedure TAI.ProcessSettlers;
 var
-  i, uix, cix, ecix, dtr, Loc, RadiusLoc, Special, Food, Prod, Trade,
+  I, uix, cix, ecix, dtr, Loc, RadiusLoc, Special, Food, Prod, Trade,
   CityFood, Happy, TestScore, BestNearCityScore, BestUnusedValue,
-  BestUnusedLoc, Value, NextJob, TotalWork, V21, part, Loc1: integer;
-  Tile: cardinal;
-  FoodOk, Started: boolean;
+  BestUnusedLoc, Value, NextJob, TotalWork, V21, part, Loc1: Integer;
+  Tile: Cardinal;
+  FoodOk, Started: Boolean;
   Radius: TVicinity21Loc;
   CityAreaInfo: TCityAreaInfo;
-  TileFood, ResourceScore, CityScore: array[0..lxmax * lymax - 1] of integer;
-
-  procedure AddJob(Loc, Job, Score: integer);
+  TileFood, ResourceScore, CityScore: array[0..lxmax * lymax - 1] of Integer;
+
+  procedure AddJob(Loc, Job, Score: Integer);
   // set Score=1 for low-priority jobs
   begin
@@ -789 +789 @@
   end;
 
-  procedure ReserveCityRadius(Loc: integer);
+  procedure ReserveCityRadius(Loc: Integer);
   var
-    V21, RadiusLoc: integer;
+    V21, RadiusLoc: Integer;
     Radius: TVicinity21Loc;
   begin
@@ -808 +808 @@
   procedure ScoreRoadConnections;
   var
-    V8, nFragments, Loc, Loc1, History, RoadScore, a, b, FullyDeveloped,
-    ConnectMask: integer;
-    BridgeOk: boolean;
+    V8, nFragments, Loc, Loc1, History, RoadScore, A, B, FullyDeveloped,
+    ConnectMask: Integer;
+    BridgeOk: Boolean;
     Adjacent: TVicinity8Loc;
   begin
@@ -821 +821 @@
       if ((1 shl (Map[Loc] and fTerrain)) and (1 shl fOcean or 1 shl
         fShore or 1 shl fDesert or 1 shl fArctic or 1 shl fUNKNOWN) = 0) and
-        (RO.Territory[Loc] = me) and (Map[Loc] and FullyDeveloped = 0) and
+        (RO.Territory[Loc] = Me) and (Map[Loc] and FullyDeveloped = 0) and
         (BridgeOk or (Map[Loc] and fRiver = 0)) then
       begin
@@ -835 +835 @@
           Loc1 := Adjacent[V8 and 7];
           History := History shl 1;
-          if (Loc1 >= 0) and (RO.Territory[Loc1] = me) and
+          if (Loc1 >= 0) and (RO.Territory[Loc1] = Me) and
             (Map[Loc1] and ConnectMask <> 0) then
           begin
@@ -851 +851 @@
                   else if History and 4 <> 0 then
                   begin
-                    V8_to_ab((V8 - 1) and 7, a, b);
-                    ab_to_Loc(Loc, a shl 1, b shl 1, Loc1);
+                    V8_to_ab((V8 - 1) and 7, A, B);
+                    ab_to_Loc(Loc, A shl 1, B shl 1, Loc1);
                     if (Loc1 >= 0) and (Map[Loc1] and ConnectMask <> 0) then
                       Dec(nFragments);
@@ -876 +876 @@
 
 begin
-  fillchar(SettlerSurplus, sizeof(SettlerSurplus), 0);
+  FillChar(SettlerSurplus, SizeOf(SettlerSurplus), 0);
   JobAssignment_Initialize;
 
   if (Data.BehaviorFlags and bBarbarina = 0) or (RO.nCity < 3) then
   begin
-    fillchar(TileFood, sizeof(TileFood), 0);
-    fillchar(ResourceScore, sizeof(ResourceScore), 0);
+    FillChar(TileFood, SizeOf(TileFood), 0);
+    FillChar(ResourceScore, SizeOf(ResourceScore), 0);
     for Loc := 0 to MapSize - 1 do
       if Map[Loc] and fTerrain <> fUNKNOWN then
@@ -923 +923 @@
 
     // rate possible new cities
-    fillchar(CityScore, MapSize * sizeof(integer), 0);
+    FillChar(CityScore, MapSize * SizeOf(Integer), 0);
     for Loc := 0 to MapSize - 1 do
     begin
@@ -930 +930 @@
         ((RO.Government <> gDespotism) or (Map[Loc] and fSpecial = fSpecial1)) or
         (Map[Loc] and (fTerrain or fSpecial) = fPrairie or fSpecial1));
-      if FoodOk and ((RO.Territory[Loc] < 0) or (RO.Territory[Loc] = me)) then
+      if FoodOk and ((RO.Territory[Loc] < 0) or (RO.Territory[Loc] = Me)) then
       begin
         TestScore := 0;
@@ -950 +950 @@
         if CityFood >= MinCityFood then // city is worth founding
         begin
-          TestScore := (72 + 2 * TestScore) shl 8 + ((loc xor me) * 4567) mod 251;
+          TestScore := (72 + 2 * TestScore) shl 8 + ((loc xor Me) * 4567) mod 251;
           // some unexactness, random but always the same for this tile
           if TestScore > BestNearCityScore then
@@ -988 +988 @@
               if not (Map[RadiusLoc] and fTerrain in [fDesert, fArctic]) then
               begin
-                assert(RadiusLoc >= 0);
+                Assert(RadiusLoc >= 0);
                 TileWorkPlan(RadiusLoc, cix, Value, NextJob, TotalWork);
                 if (NextJob = jRoad) and (Built[imPalace] +
@@ -1000 +1000 @@
             begin // tile could be exploited
               RadiusLoc := Radius[V21];
-              assert(RadiusLoc >= 0);
+              Assert(RadiusLoc >= 0);
               if not (Map[RadiusLoc] and fTerrain in [fDesert, fArctic]) then
               begin
@@ -1024 +1024 @@
   if Data.BehaviorFlags and bBarbarina = 0 then // low priority jobs
     for Loc := 0 to MapSize - 1 do
-      if RO.Territory[Loc] = me then
+      if RO.Territory[Loc] = Me then
       begin
         Tile := Map[Loc];
@@ -1048 +1048 @@
   begin
     for part := 0 to nShipPart - 1 do
-      for i := 0 to ColonyShipPlan[part].nLocFoundCity - 1 do
-      begin
-        Loc := ColonyShipPlan[part].LocFoundCity[i];
+      for I := 0 to ColonyShipPlan[part].nLocFoundCity - 1 do
+      begin
+        Loc := ColonyShipPlan[part].LocFoundCity[I];
         Started := False;
         for uix := 0 to RO.nUn - 1 do
@@ -1056 +1056 @@
           begin
             Started := True;
-            break;
+            Break;
           end;
         if not Started then
@@ -1119 +1119 @@
             begin // settlers could be added to this city
               Happy := BasicHappy;
-              for i := 0 to nWonder - 1 do
-                if Built[i] > 0 then
+              for I := 0 to nWonder - 1 do
+                if Built[I] > 0 then
                   Inc(Happy);
               if Built[imTemple] > 0 then
@@ -1127 +1127 @@
               begin
                 Inc(Happy, 2);
-                if RO.Wonder[woBach].EffectiveOwner = me then
+                if RO.Wonder[woBach].EffectiveOwner = Me then
                   Inc(Happy, 1);
               end;
@@ -1150 +1150 @@
 procedure TAI.DoTurn;
 var
-  emix, i, p1, TaxSum, ScienceSum, NewTaxRate: integer;
-  AllHateMe: boolean;
+  emix, I, p1, TaxSum, ScienceSum, NewTaxRate: Integer;
+  AllHateMe: Boolean;
 {$IFDEF PERF}
   PF, t0, t1, t2, t3, t4, t5, t6, t7, t8, t9: int64;
@@ -1157 +1157 @@
 begin
 {$IFDEF DEBUG}
-  fillchar(DebugMap, sizeof(DebugMap), 0);
+  FillChar(DebugMap, SizeOf(DebugMap), 0);
 {$ENDIF}
 
@@ -1169 +1169 @@
   WarNations := PresenceUnknown;
   for p1 := 0 to nPl - 1 do
-    if (p1 <> me) and (1 shl p1 and RO.Alive <> 0) and (RO.Treaty[p1] < trPeace) then
+    if (p1 <> Me) and (1 shl p1 and RO.Alive <> 0) and (RO.Treaty[p1] < trPeace) then
       Inc(WarNations, 1 shl p1);
   BombardingNations := 0;
@@ -1185 +1185 @@
     CheckGender;
 
-  if G.Difficulty[me] < MaxDiff then // not on beginner level
+  if G.Difficulty[Me] < MaxDiff then // not on beginner level
   begin
     if (Data.LastResearchTech = adHorsebackRiding) and (RO.ResearchTech < 0) and
       (random(6) = 0) and (HavePort or (ContinentPresence[0] and not
-      (1 shl me or PresenceUnknown) <> 0)) then
+      (1 shl Me or PresenceUnknown) <> 0)) then
     begin
       Data.BehaviorFlags := Data.BehaviorFlags or bBarbarina_Hide;
@@ -1206 +1206 @@
           begin
             AllHateMe := False;
-            break;
+            Break;
           end;
       if AllHateMe then
@@ -1302 +1302 @@
   else
   begin
-    if (RO.TaxRate = 0) or (RO.Money < (TotalPopulation[me] - 4) * 2) then
+    if (RO.TaxRate = 0) or (RO.Money < (TotalPopulation[Me] - 4) * 2) then
       NewTaxRate := RO.TaxRate // don't check decreasing tax
     else
@@ -1309 +1309 @@
     begin
       SumCities(NewTaxRate, TaxSum, ScienceSum);
-      if RO.Money + TaxSum >= (TotalPopulation[me] - 4) then
-        break; // enough
+      if RO.Money + TaxSum >= (TotalPopulation[Me] - 4) then
+        Break; // enough
       Inc(NewTaxRate, 10);
     end;
@@ -1324 +1324 @@
     // research completed
     for p1 := 0 to nPl - 1 do
-      if (p1 <> me) and (1 shl p1 and RO.Alive <> 0) and
+      if (p1 <> Me) and (1 shl p1 and RO.Alive <> 0) and
         (RO.EnemyReport[p1].TurnOfCivilReport + TechReportOutdated > RO.Turn) and
         (RO.EnemyReport[p1].Tech[Data.LastResearchTech] < tsSeen) then
       begin // latest researched advance might be of interest to this nation
-        for i := 0 to nRequestedTechs - 1 do
-          if (Data.RequestedTechs[i] >= 0) and
-            (Data.RequestedTechs[i] shr 8 and $F = p1) then
-            Data.RequestedTechs[i] := -1;
+        for I := 0 to nRequestedTechs - 1 do
+          if (Data.RequestedTechs[I] >= 0) and
+            (Data.RequestedTechs[I] shr 8 and $F = p1) then
+            Data.RequestedTechs[I] := -1;
       end;
   if RO.ResearchTech = adMilitary then
@@ -1337 +1337 @@
   else
     Data.LastResearchTech := RO.ResearchTech;
-  for i := 0 to nRequestedTechs - 1 do
-    if (Data.RequestedTechs[i] >= 0) and
-      (RO.Tech[Data.RequestedTechs[i] and $FF] >= tsSeen) then
-      Data.RequestedTechs[i] := -1;
+  for I := 0 to nRequestedTechs - 1 do
+    if (Data.RequestedTechs[I] >= 0) and
+      (RO.Tech[Data.RequestedTechs[I] and $FF] >= tsSeen) then
+      Data.RequestedTechs[I] := -1;
 
   // prepare negotiation
@@ -1348 +1348 @@
 {$IFDEF DEBUG}
 (*for p1:=0 to nPl-1 do
-  if (p1<>me) and (1 shl p1 and RO.Alive<>0) and (RO.Treaty[p1]>=trPeace)
+  if (p1<>Me) and (1 shl p1 and RO.Alive<>0) and (RO.Treaty[p1]>=trPeace)
     and (RO.EnemyReport[p1].TurnOfCivilReport>=0) then
     TraceAdvanceValues(p1);*)
@@ -1363 +1363 @@
 
 {$IFDEF DEBUG}
-procedure TAI.TraceAdvanceValues(Nation: integer);
+procedure TAI.TraceAdvanceValues(Nation: Integer);
 var
-  ad: integer;
+  ad: Integer;
 begin
   for ad := 0 to nAdv - 1 do
@@ -1379 +1379 @@
 procedure TAI.CheckGender;
 var
-  p1, NewGender: integer;
+  p1, NewGender: Integer;
 begin
   NewGender := -1;
   for p1 := 0 to nPl - 1 do
-    if (p1 <> me) and (1 shl p1 and RO.Alive <> 0) and
+    if (p1 <> Me) and (1 shl p1 and RO.Alive <> 0) and
       (RO.Treaty[p1] >= trFriendlyContact) then
-      if PlayerHash[me] > PlayerHash[p1] then
+      if PlayerHash[Me] > PlayerHash[p1] then
       begin
         if NewGender = bMale then
         begin
           NewGender := -2;
-          break;
+          Break;
         end; // ambiguous, don't change gender
         NewGender := bFemale;
@@ -1399 +1399 @@
         begin
           NewGender := -2;
-          break;
+          Break;
         end; // ambiguous, don't change gender
         NewGender := bMale;
@@ -1412 +1412 @@
 procedure TAI.SetAdvanceValues;
 
-  procedure RateResearchAdv(ad, Time: integer);
+  procedure RateResearchAdv(ad, Time: Integer);
   var
-    Value: integer;
+    Value: Integer;
   begin
     if Time = 0 then
@@ -1424 +1424 @@
   end;
 
-  procedure SetPreqValues(ad, Value: integer);
+  procedure SetPreqValues(ad, Value: Integer);
   begin
     if (RO.Tech[ad] < tsSeen) and (ad <> RO.ResearchTech) then
@@ -1447 +1447 @@
   end;
 
-  procedure RateImpPreq(iix, Value: integer);
+  procedure RateImpPreq(iix, Value: Integer);
   begin
     if (Value > 0) and (Imp[iix].Preq >= 0) then
@@ -1454 +1454 @@
 
 var
-  emix, cix, adMissing, iad, ad, Count, i, Time, d, CurrentCost,
-  CurrentStrength, MaxSize, MaxTrade: integer;
-  PreView, Emergency, Bombarded: boolean;
+  emix, cix, adMissing, iad, ad, Count, I, Time, D, CurrentCost,
+  CurrentStrength, MaxSize, MaxTrade: Integer;
+  PreView, Emergency, Bombarded: Boolean;
 begin
   if AdvanceValuesSet then
-    exit;
+    Exit;
   AdvanceValuesSet := True;
 
-  fillchar(AdvanceValue, sizeof(AdvanceValue), 0);
+  FillChar(AdvanceValue, SizeOf(AdvanceValue), 0);
 
   // rate techs to ensure research progress
@@ -1482 +1482 @@
       begin // 2 of 3 required
         Count := 0;
-        for i := 0 to 2 do
-          if (AdvPreq[ad, i] = RO.ResearchTech) or
-            (RO.Tech[AdvPreq[ad, i]] >= tsSeen) then
+        for I := 0 to 2 do
+          if (AdvPreq[ad, I] = RO.ResearchTech) or
+            (RO.Tech[AdvPreq[ad, I]] >= tsSeen) then
             Inc(Count);
         if Count >= 2 then
@@ -1492 +1492 @@
           if ad <> adMassProduction then // don't score third preq for MP
           begin
-            for i := 0 to 2 do
-              if (AdvPreq[ad, i] <> RO.ResearchTech) and
-                (RO.Tech[AdvPreq[ad, i]] < tsSeen) then
-                RateResearchAdv(AdvPreq[ad, i], Time);
+            for I := 0 to 2 do
+              if (AdvPreq[ad, I] <> RO.ResearchTech) and
+                (RO.Tech[AdvPreq[ad, I]] < tsSeen) then
+                RateResearchAdv(AdvPreq[ad, I], Time);
           end;
           Inc(Time, 2 - Count);
@@ -1503 +1503 @@
       begin
         Count := 0;
-        for i := 0 to 1 do
-          if (AdvPreq[ad, i] <> preNone) and (AdvPreq[ad, i] <> RO.ResearchTech) and
-            (RO.Tech[AdvPreq[ad, i]] < tsSeen) then
+        for I := 0 to 1 do
+          if (AdvPreq[ad, I] <> preNone) and (AdvPreq[ad, I] <> RO.ResearchTech) and
+            (RO.Tech[AdvPreq[ad, I]] < tsSeen) then
           begin
-            RateResearchAdv(AdvPreq[ad, i], Time);
+            RateResearchAdv(AdvPreq[ad, I], Time);
             Inc(Count);
           end;
@@ -1536 +1536 @@
 
   // rate military techs
-  for d := 0 to nDomains - 1 do
+  for D := 0 to nDomains - 1 do
   begin
     CurrentCost := 0;
     CurrentStrength := 0;
     for PreView := True downto False do
-      for i := 0 to nUpgrade - 1 do
-        with Upgrade[d, i] do
+      for I := 0 to nUpgrade - 1 do
+        with Upgrade[D, I] do
           if (Preq >= 0) and not (Preq in FutureTech) then
             if ((Ro.ResearchTech = Preq) or (RO.Tech[Preq] >= tsSeen)) = PreView then
@@ -1553 +1553 @@
               else
               begin // rate
-                if (i > 0) and (Trans > 0) then
+                if (I > 0) and (Trans > 0) then
                   Inc(AdvanceValue[Preq], $400);
                 if Cost <= CurrentCost then
-                  Inc(AdvanceValue[Preq], (4 - d) * Strength * $400 div
-                    (CurrentStrength + Upgrade[d, 0].Strength))
+                  Inc(AdvanceValue[Preq], (4 - D) * Strength * $400 div
+                    (CurrentStrength + Upgrade[D, 0].Strength))
                 else
-                  Inc(AdvanceValue[Preq], (4 - d) * Strength * $200 div
-                    (CurrentStrength + Upgrade[d, 0].Strength));
+                  Inc(AdvanceValue[Preq], (4 - D) * Strength * $200 div
+                    (CurrentStrength + Upgrade[D, 0].Strength));
               end;
   end;
@@ -1640 +1640 @@
 procedure TAI.AnalyzeMap;
 var
-  cix, Loc, Loc1, V8, f1, p1: integer;
+  cix, Loc, Loc1, V8, f1, p1: Integer;
   Adjacent: TVicinity8Loc;
 begin
@@ -1646 +1646 @@
 
   // collect nation presence information for continents and oceans
-  fillchar(ContinentPresence, sizeof(ContinentPresence), 0);
-  fillchar(OceanPresence, sizeof(OceanPresence), 0);
+  FillChar(ContinentPresence, SizeOf(ContinentPresence), 0);
+  FillChar(OceanPresence, SizeOf(OceanPresence), 0);
   for Loc := 0 to MapSize - 1 do
   begin
@@ -1699 +1699 @@
   end;
 
-  fillchar(TotalPopulation, sizeof(TotalPopulation), 0);
-  fillchar(ContinentPopulation, sizeof(ContinentPopulation), 0);
-  fillchar(DistrictPopulation, 4 * nDistrict, 0);
+  FillChar(TotalPopulation, SizeOf(TotalPopulation), 0);
+  FillChar(ContinentPopulation, SizeOf(ContinentPopulation), 0);
+  FillChar(DistrictPopulation, 4 * nDistrict, 0);
 
   // count population
@@ -1716 +1716 @@
       if Loc >= 0 then
       begin
-        Inc(TotalPopulation[me], Size);
-        assert(District[Loc] >= 0);
+        Inc(TotalPopulation[Me], Size);
+        Assert(District[Loc] >= 0);
         if District[Loc] < maxCOD then
           Inc(DistrictPopulation[District[Loc]], Size);
@@ -1725 +1725 @@
 procedure TAI.CollectModelCatStat;
 var
-  i, uix, Cat, mix, Quality: integer;
+  I, uix, Cat, mix, Quality: Integer;
 begin
   // categorize models
@@ -1771 +1771 @@
         if (Loc >= 0) and (mix = mixCruiser) and (Map[Loc] and fTerrain < fGrass) then
         begin
-          i := Formation[Loc];
-          if (i >= 0) and (i < maxCOD) then
-            OceanWithShip := OceanWithShip or (1 shl i);
+          I := Formation[Loc];
+          if (I >= 0) and (I < maxCOD) then
+            OceanWithShip := OceanWithShip or (1 shl I);
         end;
 end;
@@ -1780 +1780 @@
 const
   PatrolDestination = lxmax * lymax;
-  FirstSurplusLoop: array[mctGroundDefender..mctGroundAttacker] of integer = (2, 1);
+  FirstSurplusLoop: array[mctGroundDefender..mctGroundAttacker] of Integer = (2, 1);
 var
-  Cat, i, mix, cix, uix, Loop, nModelOrder: integer;
+  Cat, I, mix, cix, uix, Loop, nModelOrder: Integer;
   Adjacent: TVicinity8Loc;
-  LocNeed: array[0..lxmax * lymax - 1] of shortint;
-  Destination: array[0..nUmax - 1] of integer;
-  DistrictNeed, DistrictNeed0: array[0..maxCOD - 1] of integer;
-  ModelOrder: array[0..nMmax - 1] of integer;
-  complete, Fortified: boolean;
-
-  function IsBombarded(cix: integer): boolean;
+  LocNeed: array[0..lxmax * lymax - 1] of ShortInt;
+  Destination: array[0..nUmax - 1] of Integer;
+  DistrictNeed, DistrictNeed0: array[0..maxCOD - 1] of Integer;
+  ModelOrder: array[0..nMmax - 1] of Integer;
+  complete, Fortified: Boolean;
+
+  function IsBombarded(cix: Integer): Boolean;
   var
-    Loc1, V8: integer;
+    Loc1, V8: Integer;
     Adjacent: TVicinity8Loc;
   begin
@@ -1809 +1809 @@
           begin
             Result := True;
-            exit;
+            Exit;
           end;
         end;
@@ -1815 +1815 @@
   end;
 
-  procedure TryUtilize(uix: integer);
+  procedure TryUtilize(uix: Integer);
   var
-    cix, ProdCost, UtilizeCost: integer;
+    cix, ProdCost, UtilizeCost: Integer;
   begin
     if (MyUnit[uix].Health = 100) and (Map[MyUnit[uix].Loc] and
@@ -1829 +1829 @@
           UtilizeCost := MyModel[MyUnit[uix].mix].Cost;
           if Prod < (ProdCost - UtilizeCost * 2 div 3) *
-            BuildCostMod[G.Difficulty[me]] div 12 then
+            BuildCostMod[G.Difficulty[Me]] div 12 then
             Unit_Disband(uix);
         end;
@@ -1835 +1835 @@
   end;
 
-  procedure FindDestination(uix: integer);
+  procedure FindDestination(uix: Integer);
   var
-    MoveStyle, V8, Loc1, Time, NextLoc, NextTime, RecoverTurns: integer;
-    Reached: array[0..lxmax * lymax - 1] of boolean;
-  begin
-    fillchar(Reached, MapSize, False);
+    MoveStyle, V8, Loc1, Time, NextLoc, NextTime, RecoverTurns: Integer;
+    Reached: array[0..lxmax * lymax - 1] of Boolean;
+  begin
+    FillChar(Reached, MapSize, False);
     Pile.Create(MapSize);
     with MyUnit[uix] do
@@ -1854 +1854 @@
         if (District[Loc1] >= 0) and (District[Loc1] < maxCOD) then
         begin
-          assert(DistrictNeed[District[Loc1]] > 0);
+          Assert(DistrictNeed[District[Loc1]] > 0);
           Dec(DistrictNeed[District[Loc1]]);
         end;
         Destination[uix] := Loc1;
-        break;
+        Break;
       end;
       Reached[Loc1] := True;
@@ -1865 +1865 @@
       begin
         NextLoc := Adjacent[V8];
-        if (NextLoc >= 0) and not Reached[NextLoc] and (RO.Territory[NextLoc] = me) then
+        if (NextLoc >= 0) and not Reached[NextLoc] and (RO.Territory[NextLoc] = Me) then
           case CheckStep(MoveStyle, Time, V8 and 1, NextTime, RecoverTurns,
               Map[Loc1], Map[NextLoc], False) of
@@ -1873 +1873 @@
               Reached[NextLoc] := True; // don't check moving there again
             csCheckTerritory:
-              assert(False);
+              Assert(False);
           end;
       end;
@@ -1887 +1887 @@
           Unit_Disband(uix);
 
-  fillchar(UnitLack, sizeof(UnitLack), 0);
-  fillchar(Destination, 4 * RO.nUn, $FF);
-  for i := 0 to maxCOD - 1 do
-    if uixPatrol[i] >= 0 then
-      Destination[uixPatrol[i]] := PatrolDestination;
+  FillChar(UnitLack, SizeOf(UnitLack), 0);
+  FillChar(Destination, 4 * RO.nUn, $FF);
+  for I := 0 to maxCOD - 1 do
+    if uixPatrol[I] >= 0 then
+      Destination[uixPatrol[I]] := PatrolDestination;
   for uix := 0 to RO.nUn - 1 do
     if (MyUnit[uix].mix = mixMilitia) or (MyUnit[uix].mix = mixCruiser) then
@@ -1903 +1903 @@
       if ModelCat[mix] = Cat then
       begin
-        i := nModelOrder;
-        while (i > 0) and (ModelQuality[mix] < ModelQuality[ModelOrder[i - 1]]) do
-        begin
-          ModelOrder[i] := ModelOrder[i - 1];
-          Dec(i);
-        end;
-        ModelOrder[i] := mix;
+        I := nModelOrder;
+        while (I > 0) and (ModelQuality[mix] < ModelQuality[ModelOrder[I - 1]]) do
+        begin
+          ModelOrder[I] := ModelOrder[I - 1];
+          Dec(I);
+        end;
+        ModelOrder[I] := mix;
         Inc(nModelOrder);
       end;
@@ -1922 +1922 @@
               TryUtilize(uix);
 
-      fillchar(LocNeed, MapSize, 0);
-      fillchar(DistrictNeed, sizeof(DistrictNeed), 0);
+      FillChar(LocNeed, MapSize, 0);
+      FillChar(DistrictNeed, SizeOf(DistrictNeed), 0);
 
       for cix := 0 to RO.nCity - 1 do
@@ -1946 +1946 @@
         for uix := 0 to RO.nUn - 1 do
           with MyUnit[uix] do
-            if (Loc >= 0) and (Job = jCity) and (RO.Territory[Loc] = me) then
+            if (Loc >= 0) and (Job = jCity) and (RO.Territory[Loc] = Me) then
             begin
               LocNeed[Loc] := 1;
@@ -1954 +1954 @@
 
       complete := Loop >= FirstSurplusLoop[Cat];
-      for i := nModelOrder - 1 downto 0 do
+      for I := nModelOrder - 1 downto 0 do
       begin
         for Fortified := True downto False do
           for uix := 0 to RO.nUn - 1 do
             with MyUnit[uix] do
-              if (mix = ModelOrder[i]) and (Loc >= 0) and
+              if (mix = ModelOrder[I]) and (Loc >= 0) and
                 (Destination[uix] < 0) and (Master < 0) and
                 ((Flags and unFortified <> 0) = Fortified) and (LocNeed[Loc] > 0) then
@@ -1972 +1972 @@
         for uix := 0 to RO.nUn - 1 do
           with MyUnit[uix] do
-            if (mix = ModelOrder[i]) and (Loc >= 0) and (Destination[uix] < 0) and
+            if (mix = ModelOrder[I]) and (Loc >= 0) and (Destination[uix] < 0) and
               (Master < 0) then
               if (District[Loc] >= 0) and (District[Loc] < maxCOD) and
@@ -1989 +1989 @@
   // distribute obsolete settlers
   repeat
-    fillchar(LocNeed, MapSize, 0);
-    fillchar(DistrictNeed, sizeof(DistrictNeed), 0);
+    FillChar(LocNeed, MapSize, 0);
+    FillChar(DistrictNeed, SizeOf(DistrictNeed), 0);
 
     for cix := 0 to RO.nCity - 1 do
@@ -2040 +2040 @@
   for uix := 0 to RO.nUn - 1 do
     with MyUnit[uix] do
-      if (Loc >= 0) and (RO.Territory[Loc] = me) and (District[Loc] >= 0) and
+      if (Loc >= 0) and (RO.Territory[Loc] = Me) and (District[Loc] >= 0) and
         (District[Loc] < maxCOD) and (ModelQuality[mix] > 0) then
         case ModelCat[mix] of
@@ -2048 +2048 @@
 end;
 
-procedure TAI.CheckAttack(uix: integer);
+procedure TAI.CheckAttack(uix: Integer);
 var
   AttackScore, BestCount, AttackLoc, TestLoc, NextLoc, TestTime, V8,
   TestScore, euix, MyDamage, EnemyDamage, OldLoc, AttackForecast,
-  MoveResult, AttackResult, MoveStyle, NextTime, RecoverTurns: integer;
-  Tile: cardinal;
-  Exhausted: boolean;
+  MoveResult, AttackResult, MoveStyle, NextTime, RecoverTurns: Integer;
+  Tile: Cardinal;
+  Exhausted: Boolean;
   Adjacent: TVicinity8Loc;
-  Reached: array[0..lxmax * lymax - 1] of boolean;
+  Reached: array[0..lxmax * lymax - 1] of Boolean;
 
 begin
@@ -2065 +2065 @@
       AttackScore := -999999;
       AttackLoc := -1;
-      fillchar(Reached, MapSize, False);
+      FillChar(Reached, MapSize, False);
       Pile.Create(MapSize);
       Pile.Put(Loc, $800 - Movement);
@@ -2077 +2077 @@
         if ((Tile and fUnit) <> 0) and ((Tile and fOwned) = 0) then
         begin // enemy unit
-          assert(TestTime < $1000);
+          Assert(TestTime < $1000);
           Unit_FindEnemyDefender(TestLoc, euix);
           if RO.Treaty[RO.EnemyUn[euix].Owner] < trPeace then
@@ -2168 +2168 @@
 end;
 
-procedure TAI.Patrol(uix: integer);
+procedure TAI.Patrol(uix: Integer);
 const
   DistanceScore = 4;
 var
   PatrolScore, BestCount, PatrolLoc, TestLoc, NextLoc, TestTime, V8,
-  TestScore, OldLoc, MoveResult, MoveStyle, NextTime, RecoverTurns: integer;
-  Tile: cardinal;
-  Exhausted, CaptureOnly: boolean;
+  TestScore, OldLoc, MoveResult, MoveStyle, NextTime, RecoverTurns: Integer;
+  Tile: Cardinal;
+  Exhausted, CaptureOnly: Boolean;
   Adjacent: TVicinity8Loc;
-  AdjacentUnknown: array[0..lxmax * lymax - 1] of shortint;
+  AdjacentUnknown: array[0..lxmax * lymax - 1] of ShortInt;
 
 begin
@@ -2196 +2196 @@
           // assume a score of 50 is the best achievable
           or CaptureOnly and (TestTime >= $1000) then
-          break;
+          Break;
 
         TestScore := 0;
@@ -2276 +2276 @@
 const
   nAttackCatOrder = 3;
-  AttackCatOrder: array[0..nAttackCatOrder - 1] of integer =
+  AttackCatOrder: array[0..nAttackCatOrder - 1] of Integer =
     (mctGroundAttacker, mctCruiser, mctGroundDefender);
 var
-  iCat, uix, uix1: integer;
-  IsPatrolUnit, Fortified: boolean;
+  iCat, uix, uix1: Integer;
+  IsPatrolUnit, Fortified: Boolean;
 begin
   for uix := 0 to RO.nUn - 1 do
@@ -2299 +2299 @@
               CheckAttack(uix);
 
-  fillchar(uixPatrol, sizeof(uixPatrol), $FF);
+  FillChar(uixPatrol, SizeOf(uixPatrol), $FF);
   for uix := 0 to RO.nUn - 1 do
     with MyUnit[uix], MyModel[mix] do
@@ -2333 +2333 @@
 end;
 
-function TAI.HavePort: boolean;
+function TAI.HavePort: Boolean;
 var
-  V8, cix, AdjacentLoc, f: integer;
+  V8, cix, AdjacentLoc, F: Integer;
   Adjacent: TVicinity8Loc;
 begin
@@ -2349 +2349 @@
           if (AdjacentLoc >= 0) and ((Map[AdjacentLoc] and fTerrain) < fGrass) then
           begin
-            f := Formation[AdjacentLoc];
-            if (f >= 0) and (f < maxCOD) and (OceanPresence[f] and
-              not (1 shl me) <> 0) then
+            F := Formation[AdjacentLoc];
+            if (F >= 0) and (F < maxCOD) and (OceanPresence[F] and
+              not (1 shl Me) <> 0) then
               Result := True;
           end;
@@ -2361 +2361 @@
 var
   uix, cix, iix, dtr, V8, V21, NewImprovement, AdjacentLoc, MaxSettlers,
-  maxcount, cixMilAcademy: integer;
-  TerrType: cardinal;
+  maxcount, cixMilAcademy: Integer;
+  TerrType: Cardinal;
   IsPort, IsNavalBase, NeedCruiser, CheckProd, Destructed, ProduceSettlers,
-  ProduceMil: boolean;
+  ProduceMil: Boolean;
   Adjacent: TVicinity8Loc;
   Radius: TVicinity21Loc;
   Report: TCityReport;
-  HomeCount, CityProdRep: array[0..nCmax - 1] of integer;
-  MilProdCity: array[0..nCmax - 1] of boolean;
-
-  procedure TryBuild(Improvement: integer);
+  HomeCount, CityProdRep: array[0..nCmax - 1] of Integer;
+  MilProdCity: array[0..nCmax - 1] of Boolean;
+
+  procedure TryBuild(Improvement: Integer);
   begin
     if (NewImprovement = imTrGoods) // not already improvement of higher priority found
@@ -2381 +2381 @@
   end;
 
-  procedure TryDestruct(Improvement: integer);
+  procedure TryDestruct(Improvement: Integer);
   begin
     if Destructed or (MyCity[cix].Built[Improvement] = 0) then
-      exit;
+      Exit;
     if City_CurrentImprovementProject(cix) >= 0 then
       City_RebuildImprovement(cix, Improvement)
@@ -2392 +2392 @@
       and (Imp[CurrentImprovementProject].Kind in [ikCommon,ikNatGlobal,ikNatLocal])
       and ((Imp[CurrentImprovementProject].Cost*3-Imp[Improvement].Cost*2)
-      *BuildCostMod[G.Difficulty[me]]>MyCity[cix].Prod*(12*3)) then}
+      *BuildCostMod[G.Difficulty[Me]]>MyCity[cix].Prod*(12*3)) then}
     Destructed := True;
   end;
 
-  function ChooseBuildModel(Cat: integer): integer;
+  function ChooseBuildModel(Cat: Integer): Integer;
   var
-    Count, mix: integer;
+    Count, mix: Integer;
   begin
     Count := 0;
@@ -2409 +2409 @@
           Result := mix;
       end;
-    assert(Count > 0);
+    Assert(Count > 0);
   end;
 
@@ -2415 +2415 @@
   // find military production cities
   var
-    cix, Total, d, Threshold, NewThreshold, Share, SharePlus, cixWorst: integer;
-  begin
-    fillchar(MilProdCity, RO.nCity, 0);
+    cix, Total, D, Threshold, NewThreshold, Share, SharePlus, cixWorst: Integer;
+  begin
+    FillChar(MilProdCity, RO.nCity, 0);
     GetCityProdPotential;
-    for d := 0 to maxCOD - 1 do
+    for D := 0 to maxCOD - 1 do
     begin
       Total := 0;
       for cix := 0 to RO.nCity - 1 do
         with MyCity[cix] do
-          if (Loc >= 0) and (District[Loc] = d) then
+          if (Loc >= 0) and (District[Loc] = D) then
             Total := Total + CityResult[cix];
       if Total = 0 then
@@ -2433 +2433 @@
       for cix := 0 to RO.nCity - 1 do
         with MyCity[cix] do
-          if (Loc >= 0) and (District[Loc] = d) and
+          if (Loc >= 0) and (District[Loc] = D) and
             (Built[imBarracks] + Built[imMilAcademy] > 0) then
           begin
@@ -2448 +2448 @@
         for cix := 0 to RO.nCity - 1 do
           with MyCity[cix] do
-            if (Loc >= 0) and (District[Loc] = d) and
+            if (Loc >= 0) and (District[Loc] = D) and
               (Built[imBarracks] + Built[imMilAcademy] = 0) and
               (Built[imObservatory] = 0) and (CityResult[cix] < Threshold) and
@@ -2465 +2465 @@
       for cix := 0 to RO.nCity - 1 do
         with MyCity[cix] do
-          if (Loc >= 0) and (District[Loc] = d) and
+          if (Loc >= 0) and (District[Loc] = D) and
             (Built[imBarracks] + Built[imMilAcademy] = 0) and
             (CityResult[cix] >= Threshold) then
@@ -2471 +2471 @@
 {    if (cixWorst>=0)
       and (Share-CityResult[cixWorst]*2>=Total*MilProdShare div 100) then
-      MilProdCity[cixWorst]:=false;}
+      MilProdCity[cixWorst]:=False;}
     end;
 
@@ -2478 +2478 @@
     if cixStateImp[imPalace] >= 0 then
     begin
-      d := District[MyCity[cixStateImp[imPalace]].Loc];
-      if (d >= 0) and (d < maxCOD) then
+      D := District[MyCity[cixStateImp[imPalace]].Loc];
+      if (D >= 0) and (D < maxCOD) then
       begin
         cixMilAcademy := -1;
         for cix := 0 to RO.nCity - 1 do
           with MyCity[cix] do
-            if (Loc >= 0) and (District[Loc] = d) and
+            if (Loc >= 0) and (District[Loc] = D) and
               (Built[imObservatory] + Built[imPalace] = 0) and
               ((cixMilAcademy < 0) or (CityResult[cix] > CityResult[cixMilAcademy])) then
@@ -2500 +2500 @@
   procedure ChangeHomeCities;
   var
-    uix, NewHome, HomeSupport, NewHomeSupport, SingleSupport: integer;
+    uix, NewHome, HomeSupport, NewHomeSupport, SingleSupport: Integer;
   begin
     if RO.Government in [gAnarchy, gFundamentalism] then
-      exit;
+      Exit;
     for uix := 0 to RO.nUn - 1 do
       with MyUnit[uix] do
@@ -2551 +2551 @@
 
 begin
-  fillchar(HomeCount, 4 * RO.nCity, 0);
+  FillChar(HomeCount, 4 * RO.nCity, 0);
   for uix := 0 to RO.nUn - 1 do
     with MyUnit[uix] do
@@ -2744 +2744 @@
                     begin
                       TryBuild(imHarbor);
-                      break;
+                      Break;
                     end;
                   end;
@@ -2762 +2762 @@
               TryBuild(imRecycling);
             if (Report.Trade - Report.Corruption >= 11) and
-              (RO.Money < TotalPopulation[me] * 2) then
+              (RO.Money < TotalPopulation[Me] * 2) then
               TryBuild(imBank);
             if (RO.NatBuilt[imStockEx] = 0) and
@@ -2799 +2799 @@
 
           // rebuild imps no longer needed
-          if (RO.TaxRate = 0) and (RO.Money >= TotalPopulation[me] * 4) then
+          if (RO.TaxRate = 0) and (RO.Money >= TotalPopulation[Me] * 4) then
             TryDestruct(imBank)
           else if Report.Happy * 2 >= Size + 6 then
@@ -2825 +2825 @@
 end;
 
-function TAI.ChooseGovernment: integer;
+function TAI.ChooseGovernment: Integer;
 begin
   if Data.BehaviorFlags and bBarbarina <> 0 then
@@ -2846 +2846 @@
 //-------------------------------
 
-function TAI.MostWanted(Nation, adGiveAway: integer): integer;
+function TAI.MostWanted(Nation, adGiveAway: Integer): Integer;
 var
-  ad: integer;
+  ad: Integer;
 begin
   Result := -1;
@@ -2876 +2876 @@
 end;
 
-procedure TAI.FindBestTrade(Nation: integer; var adWanted, adGiveAway: integer);
+procedure TAI.FindBestTrade(Nation: Integer; var adWanted, adGiveAway: Integer);
 var
-  i, ad, ead, adTestGiveAway: integer;
+  I, ad, ead, adTestGiveAway: Integer;
 begin
   adWanted := -1;
@@ -2888 +2888 @@
     begin
       adTestGiveAway := -1;
-      for i := 0 to nRequestedTechs - 1 do
-        if (Data.RequestedTechs[i] >= 0) and
-          (Data.RequestedTechs[i] and $FFFF = Nation shl 8 + ead) then
+      for I := 0 to nRequestedTechs - 1 do
+        if (Data.RequestedTechs[I] >= 0) and
+          (Data.RequestedTechs[I] and $FFFF = Nation shl 8 + ead) then
           adTestGiveAway := -2; // already requested before
       if adTestGiveAway = -1 then
@@ -2913 +2913 @@
 end;
 
-function TAI.WantNegotiation(Nation: integer; NegoTime: TNegoTime): boolean;
+function TAI.WantNegotiation(Nation: Integer; NegoTime: TNegoTime): Boolean;
 var
-  p1, Count, adWanted, adGiveAway: integer;
+  p1, Count, adWanted, adGiveAway: Integer;
 begin
   if Data.BehaviorFlags and bBarbarina = bBarbarina then
   begin
     Result := Barbarina_WantNegotiation(Nation, NegoTime);
-    exit;
+    Exit;
   end;
 
@@ -2928 +2928 @@
     begin
       Result := False;
-      exit;
+      Exit;
     end;
     Count := 0;
     for p1 := 0 to nPl - 1 do
-      if (p1 <> me) and (1 shl p1 and RO.Alive <> 0) and (RO.Treaty[p1] >= trPeace) then
+      if (p1 <> Me) and (1 shl p1 and RO.Alive <> 0) and (RO.Treaty[p1] >= trPeace) then
         Inc(Count);
     if Count >= 3 then // enough peace made
     begin
       Result := False;
-      exit;
+      Exit;
     end;
   end;
@@ -2978 +2978 @@
 procedure TAI.DoNegotiation;
 var
-  i, adWanted, adGiveAway, adToGet, Slot: integer;
-  BuildFreeOffer: boolean;
+  I, adWanted, adGiveAway, adToGet, Slot: Integer;
+  BuildFreeOffer: Boolean;
 begin
   if MyLastAction = scDipOffer then
@@ -3010 +3010 @@
   begin
     Barbarina_DoNegotiation;
-    exit;
+    Exit;
   end;
 
@@ -3016 +3016 @@
   begin
     Barbarina_DoCheckNegotiation;
-    exit;
+    Exit;
   end;
 
@@ -3031 +3031 @@
       (OppoOffer.nDeliver + OppoOffer.nCost = 1) and
       (OppoOffer.Price[0] and opMask = opTreaty) and
-      (integer(OppoOffer.Price[0] - opTreaty) > RO.Treaty[Opponent]) and
+      (Integer(OppoOffer.Price[0] - opTreaty) > RO.Treaty[Opponent]) and
       ((OppoOffer.Price[0] - opTreaty < trAlliance) or
       (RO.Tech[adScience] >= tsSeen)) then
       MyAction := scDipAccept // accept all treaties
     else if (RO.Treaty[Opponent] >= trPeace) and (OppoOffer.nDeliver = 1) and
-      (OppoOffer.Price[0] and $FFFF0000 = opCivilReport + cardinal(Opponent) shl 16) and
+      (OppoOffer.Price[0] and $FFFF0000 = opCivilReport + Cardinal(Opponent) shl 16) and
       (OppoOffer.nCost = 1) and (OppoOffer.Price[1] and $FFFF0000 =
-      opCivilReport + cardinal(me) shl 16) then
+      opCivilReport + Cardinal(Me) shl 16) then
       MyAction := scDipAccept // accept exchange of civil reports
     else if (OppoOffer.nDeliver = 1) and (OppoOffer.nCost = 1) and
@@ -3068 +3068 @@
         adWanted := MostWanted(Opponent, OppoOffer.Price[1] - opTech);
         if (OppoOffer.Price[0] and opMask = opTech) and
-          (cardinal(adWanted) = OppoOffer.Price[0] - opTech) then
+          (Cardinal(adWanted) = OppoOffer.Price[0] - opTech) then
           MyAction := scDipAccept // opponent's offer is already perfect
         else if adWanted >= 0 then
@@ -3124 +3124 @@
         MyOffer.Price[1] := opTech + adWanted;
         MyAction := scDipOffer;
-        for i := 0 to nRequestedTechs - 1 do
-          if Data.RequestedTechs[i] < 0 then
+        for I := 0 to nRequestedTechs - 1 do
+          if Data.RequestedTechs[I] < 0 then
           begin
-            Slot := i;
-            break;
+            Slot := I;
+            Break;
           end
-          else if (i = 0) or (Data.RequestedTechs[i] shr 16 <
+          else if (I = 0) or (Data.RequestedTechs[I] shr 16 <
             Data.RequestedTechs[Slot] shr 16) then // find most outdated entry
-            Slot := i;
+            Slot := I;
         Data.RequestedTechs[Slot] := RO.Turn shl 16 + Opponent shl 8 + adWanted;
       end;
@@ -3141 +3141 @@
 procedure SetLeaveOutValue;
 
-  procedure Process(ad: integer);
+  procedure Process(ad: Integer);
   var
-    i: integer;
+    I: Integer;
   begin
     if LeaveOutValue[ad] < 0 then
     begin
       LeaveOutValue[ad] := 0;
-      for i := 0 to 1 do
-        if AdvPreq[ad, i] >= 0 then
-        begin
-          Process(AdvPreq[ad, i]);
-          if AdvPreq[ad, i] in LeaveOutTechs then
-            Inc(LeaveOutValue[ad], LeaveOutValue[AdvPreq[ad, i]] + 1);
+      for I := 0 to 1 do
+        if AdvPreq[ad, I] >= 0 then
+        begin
+          Process(AdvPreq[ad, I]);
+          if AdvPreq[ad, I] in LeaveOutTechs then
+            Inc(LeaveOutValue[ad], LeaveOutValue[AdvPreq[ad, I]] + 1);
         end;
     end;
@@ -3159 +3159 @@
 
 var
-  ad: integer;
+  ad: Integer;
 begin
   FillChar(LeaveOutValue, SizeOf(LeaveOutValue), $FF);
@@ -3168 +3168 @@
 
 initialization
-  RWDataSize := sizeof(TPersistentData);
+  RWDataSize := SizeOf(TPersistentData);
   SetLeaveOutValue;