Changeset 548 for trunk/AI

Timestamp:

Apr 21, 2024, 10:57:18 AM (7 months ago)

Author:

chronos

Message:

• Fixed: Bad unit drawing in battle dialog.
• Modified: Code cleanup.

Location:

trunk/AI/StdAI

Files:

• AI.pas (modified) (4 diffs)
• ToolAI.pas (modified) (1 diff)

trunk/AI/StdAI/AI.pas

@@ -231 +231 @@
         else
         begin
-          Quality := trunc(100 * (ln(mi.Attack) + ln(mi.Defense) +
-            ln(mi.Speed / 150) * 1.7 - ln(mi.Cost)));
+          Quality := Trunc(100 * (Ln(mi.Attack) + Ln(mi.Defense) +
+            Ln(mi.Speed / 150) * 1.7 - Ln(mi.Cost)));
           if mi.Cap and (1 shl (mcFanatic - mcFirstNonCap)) <> 0 then
-            Inc(Quality, trunc(100 * ln(1.5)));
+            Inc(Quality, Trunc(100 * Ln(1.5)));
           if mi.Cap and (1 shl (mcLongRange - mcFirstNonCap)) <> 0 then
-            Inc(Quality, trunc(100 * ln(1.5)));
+            Inc(Quality, Trunc(100 * Ln(1.5)));
         end;
       end
@@ -242 +242 @@
       begin
         Category := mctGroundDefender;
-        Quality := trunc(100 * (ln(mi.Defense) - ln(mi.Cost) * 0.6));
+        Quality := Trunc(100 * (Ln(mi.Defense) - Ln(mi.Cost) * 0.6));
         if mi.Cap and (1 shl (mcFanatic - mcFirstNonCap)) <> 0 then
-          Inc(Quality, trunc(100 * ln(1.5)));
+          Inc(Quality, Trunc(100 * Ln(1.5)));
       end;
     dSea:
@@ -257 +257 @@
           if EffectiveTransport > 4 then
             EffectiveTransport := 4; // rarely used more
-          Quality := 100 + trunc(100 * (ln(EffectiveTransport) +
-            ln(mi.Speed / 150) + ln(mi.Defense) - ln(mi.Cost)));
+          Quality := 100 + Trunc(100 * (Ln(EffectiveTransport) +
+            Ln(mi.Speed / 150) + Ln(mi.Defense) - Ln(mi.Cost)));
           if mi.Cap and (1 shl (mcNav - mcFirstNonCap)) <> 0 then
-            Inc(Quality, trunc(100 * ln(1.5)));
+            Inc(Quality, Trunc(100 * Ln(1.5)));
           if mi.Cap and (1 shl (mcAirDef - mcFirstNonCap)) <> 0 then
-            Inc(Quality, trunc(100 * ln(1.3)));
+            Inc(Quality, Trunc(100 * Ln(1.3)));
         end;
       end
@@ -272 +272 @@
         else
         begin
-          Quality := trunc(100 * (ln(mi.Attack) + ln(mi.Defense) * 0.6 - ln(mi.Cost)));
+          Quality := Trunc(100 * (Ln(mi.Attack) + Ln(mi.Defense) * 0.6 - Ln(mi.Cost)));
           if mi.Cap and (1 shl (mcNav - mcFirstNonCap)) <> 0 then
-            Inc(Quality, trunc(100 * ln(1.4)));
+            Inc(Quality, Trunc(100 * Ln(1.4)));
           if mi.Cap and (1 shl (mcAirDef - mcFirstNonCap)) <> 0 then
-            Inc(Quality, trunc(100 * ln(1.3)));
+            Inc(Quality, Trunc(100 * Ln(1.3)));
           if mi.Cap and (1 shl (mcLongRange - mcFirstNonCap)) <> 0 then
-            Inc(Quality, trunc(100 * ln(2.0)));
+            Inc(Quality, Trunc(100 * Ln(2.0)));
           if mi.Cap and (1 shl (mcRadar - mcFirstNonCap)) <> 0 then
-            Inc(Quality, trunc(100 * ln(1.5)));
+            Inc(Quality, Trunc(100 * Ln(1.5)));
         end;
       end;

trunk/AI/StdAI/ToolAI.pas

@@ -197 +197 @@
       X := Loc - Y * G.lx;
       Inc(sy, Y);
-      A := 2 * pi * X / G.lx;
-      su := su + cos(A);
-      sv := sv + sin(A);
+      A := 2 * Pi * X / G.lx;
+      su := su + Cos(A);
+      sv := sv + Sin(A);
       Inc(N);
     end;
   end;
-  A := arctan2(sv, su);
-  X := round(G.lx * A / (2 * pi));
+  A := ArcTan2(sv, su);
+  X := Round(G.lx * A / (2 * Pi));
   while X >= G.lx do
     Dec(X, G.lx);