Starchart and base-attack tweaks.

[super-star-trek.git] / src / ai.c

diff --git a/src/ai.c b/src/ai.c
index 31d19ad13bdcf06293ab473679a9abfc09a817a5..91e3ec9f91c8cce5616e97715fd95a3199d88217 100644 (file)
--- a/src/ai.c
+++ b/src/ai.c
@@ -82,7 +82,7 @@ force is -1000. Having shields down subtracts an additional 1000.
 346*K + 400*R + 500*(C+S) - 400 for expert and emeritus.
 
 Attacker Initial energy levels (nominal):
-Klingon   Romulan   Commander   Super-Commander
+        Klingon    Romulan    Commander   Super-Commander
 Novice    400        700        1200        
 Fair      425        750        1250
 Good      450        800        1300        1750
@@ -263,7 +263,7 @@ static void movebaddy(coord com, int loccom, feature ienm)
        if (!damaged(DSRSENS) || game.condition == docked) {
            proutn("***");
            cramen(ienm);
-           proutn(_(" from %s"), cramlc(2, com));
+           proutn(_(" from %s"), cramlc(sector, com));
            if (game.kdist[loccom] < dist1)
                proutn(_(" advances to "));
            else
@@ -363,7 +363,7 @@ static bool movescom(coord iq, bool avoid)
            game.state.planets[i].pclass = destroyed;
            game.state.galaxy[game.state.kscmdr.x][game.state.kscmdr.y].planet = NOPLANET;
            if (!damaged(DRADIO) || game.condition == docked) {
-               pause_game(true);
+               announce();
                prout(_("Lt. Uhura-  \"Captain, Starfleet Intelligence reports"));
                proutn(_("   a planet in "));
                proutn(cramlc(quadrant, game.state.kscmdr));
@@ -389,7 +389,7 @@ void supercommander(void)
        prout("== SUPERCOMMANDER");
 
     /* Decide on being active or passive */
-    avoid = ((NKILLC+NKILLK)/(game.state.date+0.01-game.indate) < 0.1*game.skill*(game.skill+1.0) ||
+    avoid = ((game.incom - game.state.remcom + game.inkling - game.state.remkl)/(game.state.date+0.01-game.indate) < 0.1*game.skill*(game.skill+1.0) ||
            (game.state.date-game.indate) < 3.0);
     if (!game.iscate && avoid) {
        /* compute move away from Enterprise */
@@ -525,7 +525,7 @@ void supercommander(void)
                if (damaged(DRADIO) && game.condition != docked)
                    return; /* no warning */
                game.iseenit = true;
-               pause_game(true);
+               announce();
                proutn(_("Lt. Uhura-  \"Captain, the starbase in "));
                proutn(cramlc(quadrant, game.state.kscmdr));
                skip(1);
@@ -550,7 +550,7 @@ void supercommander(void)
         (damaged(DRADIO) && game.condition != docked) ||
         !game.state.galaxy[game.state.kscmdr.x][game.state.kscmdr.y].charted))
        return;
-    pause_game(true);
+    announce();
     prout(_("Lt. Uhura-  \"Captain, Starfleet Intelligence reports"));
     proutn(_("   the Super-commander is in "));
     proutn(cramlc(quadrant, game.state.kscmdr));