5. Half the quadrants now have inhabited planets, from which one
cannot mine dilithium (there will still be the same additional number
- of dilithium-bearing planets). Right now this is just color, but
- eventually we'll fold in BSD-Trek-like logic for Klingons to attack
- and enslave inhabited worlds.
+ of dilithium-bearing planets). Torpedoing an inhabited world is *bad*.
+ There is BSD-Trek-like logic for Klingons to attack and enslave
+ inhabited worlds, producing more ships (only is skill is 'good' or
+ better). (Controlled by OPTION_WORLDS and turned off if game
+ type is "plain" or "almy".)
+
+ 6. User input is now logged so we can do regression testing.
+
+ 7. More BSD-Trek features: You can now lose if your entire crew
+ dies in battle. When abandoning ship in a game with inhabited
+ worlds enabled, they must have one in the quadrant to beam down
+ to; otherwise they die in space and this counts heavily against
+ your score. Docking at a starbase replenishes your crew.
*/
/* the input queue */
char citem[10];
int seed; // the random-number seed
bool idebug; // debug mode
-bool randready; // Has the random-number generator initialized?
-FILE *logfp;
+FILE *logfp, *replayfp;
char *device[NDEVICES] = {
"S. R. Sensors",
{"QUIT", QUIT, 0},
#define HELP 36
{"HELP", HELP, 0},
+#define SEED 37
+ {"SEED", SEED, 0},
};
#define NUMCOMMANDS sizeof(commands)/sizeof(commands[0])
static void makemoves(void)
{
- int i, v = 0;
+ int key, i, v = 0;
bool hitme;
clrscr();
setwnd(message_window);
if (game.ididit) hitme = true;
break;
case MOVE: // move
- warp(1);
+ warp(false);
break;
case SHIELDS: // shields
doshield(1);
dreprt();
break;
case CHART: // chart
- chart(0);
+ chart(false);
break;
case IMPULSE: // impulse
impuls();
game.alldone = 1; // quit the game
break;
case HELP:
- helpme(); // get help
+ helpme(); // get help
+ break;
+ case SEED: // set random-number seed
+ key = scan();
+ if (key == IHREAL)
+ seed = (int)aaitem;
break;
}
commandhook(commands[i].name, false);
if (game.alldone) break; // Events did us in
}
if (game.state.galaxy[game.quadrant.x][game.quadrant.y].supernova) { // Galaxy went Nova!
- atover(0);
+ atover(false);
continue;
}
- if (hitme && game.justin==0) {
+ if (hitme && !game.justin) {
attack(2);
if (game.alldone) break;
if (game.state.galaxy[game.quadrant.x][game.quadrant.y].supernova) { // went NOVA!
- atover(0);
+ atover(false);
hitme = true;
continue;
}
else
game.options |= OPTION_TTY;
- while ((option = getopt(argc, argv, "t")) != -1) {
+ seed = (int)time(NULL);
+ while ((option = getopt(argc, argv, "r:tx")) != -1) {
switch (option) {
+ case 'r':
+ replayfp = fopen(optarg, "r");
+ if (replayfp == NULL) {
+ fprintf(stderr, "sst: can't open replay file %s\n", optarg);
+ exit(1);
+ }
+ if (fscanf(replayfp, "seed %d\n", &seed) != 1) {
+ fprintf(stderr, "sst: replay file %s is ill-formed\n", optarg);
+ exit(1);
+ }
+ /* FALL THROUGH */
case 't':
game.options |= OPTION_TTY;
game.options &=~ OPTION_CURSES;
break;
+ case 'x':
+ idebug = true;
+ break;
default:
- fprintf(stderr, "usage: sst [-t] [startcommand...].\n");
+ fprintf(stderr, "usage: sst [-t] [-x] [startcommand...].\n");
exit(0);
}
}
+ /* where to save the input in case of bugs */
+ logfp = fopen("sst-input.log", "w");
+ setlinebuf(logfp);
+ fprintf(logfp, "seed %d\n", seed);
+ srand(seed);
- randomize();
+ srand(seed);
iostart();
line[0] = '\0';
double Rand(void)
{
- if (!randready) {
- if (seed == 0)
- seed = (unsigned)time(NULL);
- if (idebug)
- fprintf(logfp, "seed %d\n", seed);
- srand(seed);
- randready = true;
- }
return rand()/(1.0 + (double)RAND_MAX);
}
if (game.damage[i] > 0.0)
game.damage[i] = 0.0;
}
- proutn("Toggle game.idebug? ");
+ proutn("Toggle debug flag? ");
if (ja() != 0) {
idebug = !idebug;
if (idebug) prout("Debug output ON");
}
proutn("Examine/change events? ");
if (ja() != 0) {
+ event *ev;
+ coord w;
int i;
for (i = 1; i < NEVENTS; i++) {
int key;
- if (!is_scheduled(i)) continue;
switch (i) {
case FSNOVA: proutn("Supernova "); break;
case FTBEAM: proutn("T Beam "); break;
case FCDBAS: proutn("Base Destroy "); break;
case FSCMOVE: proutn("SC Move "); break;
case FSCDBAS: proutn("SC Base Destroy "); break;
+ case FDSPROB: proutn("Probe Move "); break;
+ case FDISTR: proutn("Distress Call "); break;
+ case FENSLV: proutn("Enlavement "); break;
+ case FREPRO: proutn("Klingon Build "); break;
}
- proutn("%.2f", scheduled(i)-game.state.date);
+ if (is_scheduled(i)) {
+ proutn("%.2f", scheduled(i)-game.state.date);
+ if (i == FENSLV || i == FREPRO) {
+ ev = findevent(i);
+ proutn(" in %d-%d", ev->quadrant.x,ev->quadrant.y);
+ }
+ } else
+ proutn("never");
+ proutn("? ");
chew();
- proutn(" ?");
key = scan();
- if (key == IHREAL) {
- schedule(i, aaitem);
+ if (key == 'n') {
+ unschedule(i);
+ chew();
+ } else if (key == IHREAL) {
+ ev = schedule(i, aaitem);
+ if (i == FENSLV || i == FREPRO) {
+ chew();
+ proutn("In quadrant- ");
+ key = scan();
+ /* IHEOL says to leave coordinates as they are */
+ if (key != IHEOL) {
+ if (key != IHREAL) {
+ prout("Event %d canceled, no x coordinate.", i);
+ unschedule(i);
+ continue;
+ }
+ w.x = (int)aaitem;
+ key = scan();
+ if (key != IHREAL) {
+ prout("Event %d canceled, no y coordinate.", i);
+ unschedule(i);
+ continue;
+ }
+ w.y = (int)aaitem;
+ ev->quadrant = w;
+ }
+ }
}
}
chew();
}
proutn("Induce supernova here? ");
- if (ja() != 0) {
+ if (ja()) {
game.state.galaxy[game.quadrant.x][game.quadrant.y].supernova = true;
- atover(1);
+ atover(true);
}
}
projects / super-star-trek.git / blobdiff