Changeset 349 for branches/highdpi/AI/StdAI

Timestamp:

Apr 6, 2021, 8:11:02 PM (5 years ago)

Author:

chronos

Message:

• Modified: Merged trunk branch version r348 into highdpi branch.

Location:

branches/highdpi/AI/StdAI

Files:

• AI.pas (modified) (2 diffs)
• Barbarina.pas (modified) (9 diffs)
• Protocol.pas (modified) (9 diffs)
• ToolAI.pas (modified) (1 diff)

branches/highdpi/AI/StdAI/AI.pas

@@ -1122 +1122 @@
             begin // settlers could be added to this city
               Happy := BasicHappy;
-              for i := 0 to 27 do
+              for i := 0 to nWonder - 1 do
                 if Built[i] > 0 then
                   Inc(Happy);
@@ -2596 +2596 @@
           if (iix >= 0) and (((Imp[iix].Kind in [ikNatLocal, ikNatGlobal]) and
             (RO.NatBuilt[iix] > 0)) or ((Imp[iix].Kind = ikWonder) and
-            (RO.Wonder[iix].CityID <> -1))) then
+            (RO.Wonder[iix].CityID <> WonderNotBuiltYet))) then
             CheckProd := True;
         end;

branches/highdpi/AI/StdAI/Barbarina.pas

@@ -1242 +1242 @@
       WonderAvailable := WonderAvailable and PrimeWonder; // alway prefer prime wonders
     Count := 0;
-    for iix := 0 to 27 do
+    for iix := 0 to nWonder - 1 do
     begin
       if (1 shl iix) and WonderAvailable <> 0 then
@@ -1254 +1254 @@
     end;
     Count := Random(Count);
-    for iix := 0 to 27 do
+    for iix := 0 to nWonder - 1 do
     begin
       if (1 shl iix) and WonderAvailable <> 0 then
@@ -1326 +1326 @@
   WonderAvailable := 0;
   WonderInWork := 0;
-  for iix := 0 to 27 do
+  for iix := 0 to nWonder - 1 do
     if (Imp[iix].Preq <> preNA) and ((Imp[iix].Preq = preNone) or
-      IsResearched(Imp[iix].Preq)) and (RO.Wonder[iix].CityID = -1) then
+      IsResearched(Imp[iix].Preq)) and (RO.Wonder[iix].CityID = WonderNotBuiltYet) then
       Inc(WonderAvailable, 1 shl iix);
   for cix := 0 to RO.nCity - 1 do
@@ -1334 +1334 @@
     begin
       iix := City_CurrentImprovementProject(cix);
-      if (iix >= 0) and (iix < 28) then
+      if (iix >= 0) and (iix < nWonder) then
         Inc(WonderInWork, 1 shl iix)
       else if iix = imPalace then
@@ -1428 +1428 @@
 
           iix := City_CurrentImprovementProject(cix);
-          if (iix >= 0) and (iix < 28) or (iix = imPalace) or
+          if (iix >= 0) and (iix < nWonder) or (iix = imPalace) or
             (iix = imShipComp) or (iix = imShipPow) or (iix = imShipHab) then
             City_OptimizeTiles(cix, rwMaxProd)
@@ -1447 +1447 @@
           if cix = cixNewCapital then
             City_StartImprovement(cix, imPalace)
-          else if (iix >= 0) and (iix < 28) and ((1 shl iix) and
+          else if (iix >= 0) and (iix < nWonder) and ((1 shl iix) and
             WonderAvailable <> 0) then
           // complete wonder production first
@@ -1500 +1500 @@
               if ((RO.Government <> gDespotism) or (RO.nUn >= RO.nCity * 4)) and
                 not IsResearched(adMassProduction) and (Built[imPalace] > 0) and
-                (RO.Wonder[woZeus].CityID = -1) and City_Improvable(cix, woZeus) then
+                (RO.Wonder[woZeus].CityID = WonderNotBuiltYet) and City_Improvable(cix, woZeus) then
                 City_StartImprovement(cix, woZeus)
               else if (City_CurrentImprovementProject(cix) >= 0) and
-                (City_CurrentImprovementProject(cix) < 28) then
+                (City_CurrentImprovementProject(cix) < nWonder) then
               begin// wonder already built, try to switch to different one
                 if (WonderAvailable and not WonderInWork > 0) and
@@ -1553 +1553 @@
               begin // low prio projects
                 ImportantCity := WillProduceColonyShip or (Built[imPalace] > 0);
-                for iix := 0 to 27 do
+                for iix := 0 to nWonder - 1 do
                   if Built[iix] > 0 then
                     ImportantCity := True;
@@ -1605 +1605 @@
             City_RebuildImprovement(cix, imTownHall)
           else if (RO.Government = gFundamentalism) and not WillProduceColonyShip then
-            for iix := 28 to nImp - 1 do
+            for iix := nWonder to nImp - 1 do
               if (Built[iix] > 0) and
                 ((iix in [imTemple, imTheater, imCathedral, imColosseum,

branches/highdpi/AI/StdAI/Protocol.pas

@@ -11 +11 @@
   nImp = 70; { number of improvements }
   nPl = 15; { max number of players, don't change! }
+  nWonder = 28; { max number of wonders }
   nUmax = 4096; { max units/player, don't set above 4096 }
   nCmax = 1024; { max cities/player, don't set above 4096 }
@@ -1265 +1266 @@
 mcHospital = mcSupplyShip;
 
+// Wonders CityID constants
+WonderNotBuiltYet = -1;
+WonderDestroyed = -2;
+
 type
   TServerCall = function (Command, Player, Subject: Integer; var Data)
@@ -1287 +1292 @@
     Flags: Cardinal;
   end;
+  PUn = ^TUn;
 
   { TCity }
@@ -1310 +1316 @@
     // array value =1 indicates built improvement
   end;
+  PCity = ^TCity;
 
   TModel = packed record
@@ -1348 +1355 @@
     Flags: Word;
   end;
+  PUnitInfo = ^TUnitInfo;
 
   TCityInfo = packed record
@@ -1358 +1366 @@
     Flags: Word;
   end;
+  PCityInfo = ^TCityInfo;
 
   TModelInfo = packed record
@@ -1587 +1596 @@
 
   TTileList = array [0 .. INFIN] of Cardinal;
+  PTileList = ^TTileList;
   TTileObservedLastList = array [0 .. INFIN] of SmallInt;
   TOwnerList = array [0 .. INFIN] of ShortInt;
@@ -1641 +1651 @@
     Tribute: array [0 .. nPl - 1] of Integer; // no longer in use
     TributePaid: array [0 .. nPl - 1] of Integer; // no longer in use
-    Wonder: array [0 .. 27] of TWonderInfo;
+    Wonder: array [0 .. nWonder - 1] of TWonderInfo;
     Ship: array [0 .. nPl - 1] of TShipInfo;
-    NatBuilt: array [28 .. (nImp + 3) div 4 * 4 - 1] of ShortInt;
+    NatBuilt: array [nWonder .. (nImp + 3) div 4 * 4 - 1] of ShortInt;
     nBattleHistory: Integer;
     BattleHistory: ^TBattleList; // complete list of all my battles in the whole game
@@ -1768 +1778 @@
 procedure DelphiRandomize;
 
+
 implementation
 

branches/highdpi/AI/StdAI/ToolAI.pas

@@ -234 +234 @@
       Inc(Result, CityReport.FoodRep - CityReport.Eaten);
   end;
-  for i := 28 to nImp - 1 do
+  for i := nWonder to nImp - 1 do
     if MyCity[cix].Built[i] > 0 then
       Dec(Result, Imp[i].Maint);