X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=setup.c;h=40e610bcc87bbc25915699275a2cebe7908db54f;hp=d729c615576ba411ca1d8dd6a0cbd15df19780ab;hb=6cd94d4cc2906e2c02553c9005f28616c7067292;hpb=e7c2a3097e455ce93c62a21832e5c584031468db

diff --git a/setup.c b/setup.c
index d729c61..40e610b 100644
--- a/setup.c
+++ b/setup.c
@@ -264,13 +264,13 @@ void setup(int needprompt)
 		if (distq < 6.0*(BASEMAX+1-inbase) && Rand() < 0.75) {
 		    contflag = TRUE;
 #ifdef DEBUG
-		    proutn("DEBUG: Abandoning base #%d at %d-%d\n", i, ix, iy);
+		    prout("DEBUG: Abandoning base #%d at %d-%d", i, ix, iy);
 #endif
 		    break;
 		}
 #ifdef DEBUG
 		else if (distq < 6.0 * (BASEMAX+1-inbase)) {
-		    proutn("DEBUG: saving base #%d, close to #%d\n", i, j);
+		    prout("DEBUG: saving base #%d, close to #%d", i, j);
 		}
 #endif
 	    }
@@ -290,7 +290,9 @@ void setup(int needprompt)
 	int klump = (1.0 - r*r)*klumper;
 	if (klump > krem) klump = krem;
 	krem -= klump;
-	do iran(GALSIZE,&ix,&iy); while (game.state.galaxy[ix][iy].supernova);
+	do iran(GALSIZE,&ix,&iy);
+	while (game.state.galaxy[ix][iy].supernova ||
+		game.state.galaxy[ix][iy].klingons + klump > 9);
 	game.state.galaxy[ix][iy].klingons += klump;
     } while (krem > 0);
     // Position Klingon Commander Ships
@@ -477,11 +479,11 @@ int choose(int needprompt)
     game.state.nscrem = (skill > SKILL_FAIR ? 1 : 0);
     game.state.remtime = 7.0 * length;
     intime = game.state.remtime;
-    game.state.remkl = 2.0*intime*((skill+1 - 2*Rand())*skill*0.1+.15);
-    inkling = game.state.remkl;
+    inkling = 2.0*intime*((skill+1 - 2*Rand())*skill*0.1+.15);
     incom = skill + 0.0625*inkling*Rand();
     game.state.remcom= min(10, incom);
     incom = game.state.remcom;
+    game.state.remkl = inkling + incom + game.state.nscrem;
     game.state.remres = (inkling+4*incom)*intime;
     inresor = game.state.remres;
     if (inkling > 50) {