X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Ffinish.c;h=78680d871953b89d5ef573e3ad17db178d30998a;hb=d87b83a23fb7b5ac0ba610069a3ce7da8026fd80;hp=d23723b9813f4d491728a7f95815afbb7624592e;hpb=459d6afcbe13be588b29c8bd1fbffb39b13fdee1;p=super-star-trek.git diff --git a/src/finish.c b/src/finish.c index d23723b..78680d8 100644 --- a/src/finish.c +++ b/src/finish.c @@ -6,7 +6,7 @@ void dstrct() { /* Finish with a BANG! */ chew(); - if (game.damage[DCOMPTR] != 0.0) { + if (damaged(DCOMPTR)) { prout(_("Computer damaged; cannot execute destruct sequence.")); return; } @@ -326,7 +326,7 @@ void score(void) if (game.gamewon == 0) game.state.nromrem = 0; // None captured if no win iscore = 10*NKILLK + 50*NKILLC + ithperd + iwon - 100*game.state.basekl - 100*klship - 45*game.nhelp -5*game.state.starkl - game.casual - + 20*NKILLROM + 200*NKILLSC - 10*game.state.nplankl + game.state.nromrem; + + 20*NKILLROM + 200*NKILLSC - 10*game.state.nplankl - 300*game.state.nworldkl + game.state.nromrem; if (game.alive == 0) iscore -= 200; skip(2); prout(_("Your score --")); @@ -354,6 +354,9 @@ void score(void) if (game.state.nplankl) prout(_("%6d planets destroyed by your action %5d"), game.state.nplankl, -10*game.state.nplankl); + if ((game.options & OPTION_WORLDS) && game.state.nworldkl) + prout(_("%6d inhabited planets destroyed by your action %5d"), + game.state.nplankl, -300*game.state.nworldkl); if (game.state.basekl) prout(_("%6d bases destroyed by your action %5d"), game.state.basekl, -100*game.state.basekl);