Changeset 349 for branches/highdpi/AI/StdAI/Barbarina.pas

Timestamp:

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

Author:

chronos

Message:

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

File:

• branches/highdpi/AI/StdAI/Barbarina.pas (modified) (9 diffs)

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,