X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=src%2Fplanets.c;h=2a68878e633ed0c8211eeebcf6153175fe7265c3;hp=52bc32d6c4f02ad6ee950d288708e64aca859b61;hb=9ae916e9144e84ef1de4a86ea73a45a2bc4cc1be;hpb=3fad5b50fc2950c556a55e39a78e7129353af0b1 diff --git a/src/planets.c b/src/planets.c index 52bc32d..2a68878 100644 --- a/src/planets.c +++ b/src/planets.c @@ -23,7 +23,7 @@ void preport(void) skip(1); for (i = 0; i < game.inplan; i++) { if ((game.state.plnets[i].known != unknown - && game.state.plnets[i].crystals != 0) + && game.state.plnets[i].inhabited == UNINHABITED) || (idebug && game.state.plnets[i].w.x !=0) ) { iknow = true; @@ -33,13 +33,15 @@ void preport(void) proutn(_(" class ")); proutn(classes[game.state.plnets[i].pclass]); proutn(" "); - if (game.state.plnets[i].crystals <= 0) proutn(_("no ")); + if (game.state.plnets[i].crystals != present) + proutn(_("no ")); prout(_("dilithium crystals present.")); if (game.state.plnets[i].known==shuttle_down) prout(_(" Shuttle Craft Galileo on surface.")); } } - if (!iknow) prout(_("No information available.")); + if (!iknow) + prout(_("No information available.")); } void orbit(void) @@ -55,7 +57,7 @@ void orbit(void) prout(_("Both warp and impulse engines damaged.")); return; } - if (game.plnet.x == 0 || abs(game.sector.x-game.plnet.x) > 1 || abs(game.sector.y-game.plnet.y) > 1) { + if (!is_valid(game.plnet) || abs(game.sector.x-game.plnet.x) > 1 || abs(game.sector.y-game.plnet.y) > 1) { crmshp(); prout(_(" not adjacent to planet.")); skip(1); @@ -64,7 +66,8 @@ void orbit(void) game.optime = 0.02+0.03*Rand(); prout(_("Helmsman Sulu- \"Entering standard orbit, Sir.\"")); newcnd(); - if (consumeTime()) return; + if (consumeTime()) + return; game.height = (1400.0+7200.0*Rand()); prout(_("Sulu- \"Entered orbit at altitude %.2f kilometers.\""), game.height); game.inorbit = true; @@ -93,9 +96,11 @@ void sensor(void) if (game.state.plnets[game.iplnet].known==shuttle_down) prout(_(" Sensors show Galileo still on surface.")); proutn(_(" Readings indicate")); - if (game.state.plnets[game.iplnet].crystals == 0) proutn(_(" no")); + if (game.state.plnets[game.iplnet].crystals != present) + proutn(_(" no")); prout(_(" dilithium crystals present.\"")); - if (game.state.plnets[game.iplnet].known == unknown) game.state.plnets[game.iplnet].known = known; + if (game.state.plnets[game.iplnet].known == unknown) + game.state.plnets[game.iplnet].known = known; } } @@ -106,10 +111,11 @@ void beam(void) skip(1); if (damaged(DTRANSP)) { prout(_("Transporter damaged.")); - if (!damaged(DSHUTTL) && (game.state.plnets[game.iplnet].known==shuttle_down || game.iscraft == 1)) { + if (!damaged(DSHUTTL) && (game.state.plnets[game.iplnet].known==shuttle_down || game.iscraft == onship)) { skip(1); proutn(_("Spock- \"May I suggest the shuttle craft, Sir?\" ")); - if (ja() == true) shuttle(); + if (ja() == true) + shuttle(); } return; } @@ -128,7 +134,7 @@ void beam(void) prout(_(" you may not go down.\"")); return; } - if (game.landed==1) { + if (game.landed) { /* Coming from planet */ if (game.state.plnets[game.iplnet].known==shuttle_down) { proutn(_("Spock- \"Wouldn't you rather take the Galileo?\" ")); @@ -147,7 +153,7 @@ void beam(void) } else { /* Going to planet */ - if (game.state.plnets[game.iplnet].crystals==0) { + if (game.state.plnets[game.iplnet].crystals==absent) { prout(_("Spock- \"Captain, I fail to see the logic in")); prout(_(" exploring a planet with no dilithium crystals.")); proutn(_(" Are you sure this is wise?\" ")); @@ -176,11 +182,11 @@ void beam(void) prouts(". . . . . . .E.E.EEEERRRRRIIIIIOOOHWW"); skip(2); prout(_("Transport complete.")); - game.landed = -game.landed; - if (game.landed==1 && game.state.plnets[game.iplnet].known==shuttle_down) { + game.landed = !game.landed; + if (game.landed && game.state.plnets[game.iplnet].known==shuttle_down) { prout(_("The shuttle craft Galileo is here!")); } - if (game.landed!=1 && game.imine) { + if (!game.landed && game.imine) { game.icrystl = true; game.cryprob = 0.05; } @@ -193,15 +199,15 @@ void mine(void) { skip(1); chew(); - if (game.landed!= 1) { + if (!game.landed) { prout(_("Mining party not on planet.")); return; } - if (game.state.plnets[game.iplnet].crystals == MINED) { + if (game.state.plnets[game.iplnet].crystals == mined) { prout(_("This planet has already been strip-mined for dilithium.")); return; } - else if (game.state.plnets[game.iplnet].crystals == 0) { + else if (game.state.plnets[game.iplnet].crystals == absent) { prout(_("No dilithium crystals on this planet.")); return; } @@ -217,9 +223,10 @@ void mine(void) return; } game.optime = (0.1+0.2*Rand())*game.state.plnets[game.iplnet].pclass; - if (consumeTime()) return; + if (consumeTime()) + return; prout(_("Mining operation complete.")); - game.state.plnets[game.iplnet].crystals = MINED; + game.state.plnets[game.iplnet].crystals = mined; game.imine = game.ididit = true; } @@ -235,7 +242,7 @@ void usecrystals(void) } if (game.energy >= 1000) { prout(_("Spock- \"Captain, Starfleet Regulations prohibit such an operation")); - prout(_(" except when condition Yellow exists.")); + prout(_(" except when Condition Yellow exists.")); return; } prout(_("Spock- \"Captain, I must warn you that loading")); @@ -298,15 +305,15 @@ void shuttle(void) prout(_(" not in standard orbit.")); return; } - if ((game.state.plnets[game.iplnet].known != shuttle_down) && game.iscraft != 1) { + if ((game.state.plnets[game.iplnet].known != shuttle_down) && game.iscraft != onship) { prout(_("Shuttle craft not currently available.")); return; } - if (game.landed==-1 && game.state.plnets[game.iplnet].known==shuttle_down) { + if (!game.landed && game.state.plnets[game.iplnet].known==shuttle_down) { prout(_("You will have to beam down to retrieve the shuttle craft.")); return; } - if (game.shldup || game.condit == IHDOCKED) { + if (game.shldup || game.condition == docked) { prout(_("Shuttle craft cannot pass through shields.")); return; } @@ -328,9 +335,9 @@ void shuttle(void) return; } } - if (game.landed == 1) { + if (game.landed) { /* Kirk on planet */ - if (game.iscraft==1) { + if (game.iscraft == onship) { /* Galileo on ship! */ if (!damaged(DTRANSP)) { proutn(_("Spock- \"Would you rather use the transporter?\" ")); @@ -343,9 +350,10 @@ void shuttle(void) else proutn(_("Rescue party")); prout(_(" boards Galileo and swoops toward planet surface.")); - game.iscraft = 0; + game.iscraft = offship; skip(1); - if (consumeTime()) return; + if (consumeTime()) + return; game.state.plnets[game.iplnet].known=shuttle_down; prout(_("Trip complete.")); return; @@ -359,9 +367,10 @@ void shuttle(void) game.state.plnets[game.iplnet].known=known; game.icraft = true; skip(1); - game.landed = -1; - if (consumeTime()) return; - game.iscraft = 1; + game.landed = false; + if (consumeTime()) + return; + game.iscraft = onship; game.icraft = false; if (game.imine) { game.icrystl = true; @@ -381,12 +390,13 @@ void shuttle(void) prouts(_("The hangar doors open; the trip begins.")); skip(1); game.icraft = true; - game.iscraft = 0; - if (consumeTime()) return; + game.iscraft = offship; + if (consumeTime()) + return; game.state.plnets[game.iplnet].known = shuttle_down; - game.landed = 1; + game.landed = true; game.icraft = false; - prout(_("Trip complete")); + prout(_("Trip complete.")); return; } } @@ -414,7 +424,8 @@ void deathray(void) prout(_("Spock- \"Captain, the 'Experimental Death Ray'")); prout(_(" is highly unpredictible. Considering the alternatives,")); proutn(_(" are you sure this is wise?\" ")); - if (ja() == false) return; + if (ja() == false) + return; prout(_("Spock- \"Acknowledged.\"")); skip(1); game.ididit = true; @@ -438,7 +449,8 @@ void deathray(void) while (game.nenhere > 0) deadkl(game.ks[1], game.quad[game.ks[1].x][game.ks[1].y],game.ks[1]); prout(_("Ensign Chekov- \"Congratulations, Captain!\"")); - if (KLINGREM == 0) finish(FWON); + if (KLINGREM == 0) + finish(FWON); if ((game.options & OPTION_PLAIN) == 0) { prout(_("Spock- \"Captain, I believe the `Experimental Death Ray'")); if (Rand() <= 0.05) { @@ -489,7 +501,8 @@ void deathray(void) prout(_(" Mr. Sulu.")); for_sectors(i) for_sectors(j) - if (game.quad[i][j] == IHDOT) game.quad[i][j] = IHQUEST; + if (game.quad[i][j] == IHDOT) + game.quad[i][j] = IHQUEST; prout(_(" Captain, our quadrant is now infested with")); prouts(_(" - - - - - - *THINGS*.")); skip(1); @@ -503,71 +516,3 @@ void deathray(void) finish(FTRIBBLE); return; } - -char *systemname(int pindx) -/* return the name of a given solar system */ -{ - static char copy[BUFSIZ]; - /* the below array should not be static, or it won't gettextize - * because of the early initialization. */ - char *names[NINHAB+1] = - { - /* - * I used to find planets - * with references in ST:TOS. Eath and the Alpha Centauri - * Colony have been omitted. - * - * Some planets marked Class G and P here will be displayed as class M - * because of the way planets are generated. This is a known bug. - */ - "ERROR", - // Federation Worlds - _("Andoria (Fesoan)"), /* several episodes */ - _("Tellar Prime (Miracht)"), /* TOS: "Journey to Babel" */ - _("Vulcan (T'Khasi)"), /* many episodes */ - _("Medusa"), /* TOS: "Is There in Truth No Beauty?" */ - _("Argelius II (Nelphia)"),/* TOS: "Wolf in the Fold" ("IV" in BSD) */ - _("Ardana"), /* TOS: "The Cloud Minders" */ - _("Catulla (Cendo-Prae)"), /* TOS: "The Way to Eden" */ - _("Gideon"), /* TOS: "The Mark of Gideon" */ - _("Aldebaran III"), /* TOS: "The Deadly Years" */ - _("Alpha Majoris I"), /* TOS: "Wolf in the Fold" */ - _("Altair IV"), /* TOS: "Amok Time */ - _("Ariannus"), /* TOS: "Let That Be Your Last Battlefield" */ - _("Benecia"), /* TOS: "The Conscience of the King" */ - _("Beta Niobe I (Sarpeidon)"), /* TOS: "All Our Yesterdays" */ - _("Alpha Carinae II"), /* TOS: "The Ultimate Computer" */ - _("Capella IV (Kohath)"), /* TOS: "Friday's Child" (Class G) */ - _("Daran V"), /* TOS: "For the World is Hollow and I Have Touched the Sky" */ - _("Deneb II"), /* TOS: "Wolf in the Fold" ("IV" in BSD) */ - _("Eminiar VII"), /* TOS: "A Taste of Armageddon" */ - _("Gamma Canaris IV"), /* TOS: "Metamorphosis" */ - _("Gamma Tranguli VI (Vaalel)"), /* TOS: "The Apple" */ - _("Ingraham B"), /* TOS: "Operation: Annihilate" */ - _("Janus IV"), /* TOS: "The Devil in the Dark" */ - _("Makus III"), /* TOS: "The Galileo Seven" */ - _("Marcos XII"), /* TOS: "And the Children Shall Lead", */ - _("Omega IV"), /* TOS: "The Omega Glory" */ - _("Regulus V"), /* TOS: "Amok Time */ - _("Deneva"), /* TOS: "Operation -- Annihilate!" */ - /* Worlds from BSD Trek */ - _("Rigel II"), /* TOS: "Shore Leave" ("III" in BSD) */ - _("Beta III"), /* TOS: "The Return of the Archons" */ - _("Triacus"), /* TOS: "And the Children Shall Lead", */ - _("Exo III"), /* TOS: "What Are Little Girls Made Of?" (Class P) */ -#if 0 - // Others - _("Hansen's Planet"), /* TOS: "The Galileo Seven" */ - _("Taurus IV"), /* TOS: "The Galileo Seven" (class G) */ - _("Antos IV (Doraphane)"), /* TOS: "Whom Gods Destroy", "Who Mourns for Adonais?" */ - _("Izar"), /* TOS: "Whom Gods Destroy" */ - _("Tiburon"), /* TOS: "The Way to Eden" */ - _("Merak II"), /* TOS: "The Cloud Minders" */ - _("Coridan (Desotriana)"), /* TOS: "Journey to Babel" */ - _("Iotia"), /* TOS: "A Piece of the Action" */ -#endif - }; - - strcpy(copy, names[pindx]); - return copy; -}