Fix merge conflicts

[bsdgames-darwin.git] / battlestar / battlestar.6

diff --git a/battlestar/battlestar.6 b/battlestar/battlestar.6
index 52cddf5d19dcda5fe28d3125a43aa3dea8bb9c8a..42f86b48acd592448b292179e2b89429c30225a0 100644 (file)
--- a/battlestar/battlestar.6
+++ b/battlestar/battlestar.6
@@ -1,4 +1,4 @@
-.\"    $NetBSD: battlestar.6,v 1.7 1999/07/28 01:45:41 hubertf Exp $
+.\"    $NetBSD: battlestar.6,v 1.15 2005/09/15 02:09:41 wiz Exp $

 .\"
 .\" Copyright (c) 1983, 1993
 .\"    The Regents of the University of California.  All rights reserved.
 .\"
 .\" Copyright (c) 1983, 1993
 .\"    The Regents of the University of California.  All rights reserved.


@@ -11,11 +11,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.

-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"    This product includes software developed by the University of
-.\"    California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors

 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"


@@ -33,7 +29,7 @@
 .\"
 .\"    @(#)battlestar.6        8.1 (Berkeley) 5/31/93
 .\"
 .\"
 .\"    @(#)battlestar.6        8.1 (Berkeley) 5/31/93
 .\"

-.Dd May 31, 1993
+.Dd September 7, 2000

 .Dt BATTLESTAR 6
 .Os
 .Sh NAME
 .Dt BATTLESTAR 6
 .Os
 .Sh NAME


@@ -45,14 +41,12 @@
 .Op Ar saved-file
 .Sh DESCRIPTION
 .Nm
 .Op Ar saved-file
 .Sh DESCRIPTION
 .Nm

-is an adventure game in the classic style.  However, it's slightly less
-of a
-puzzle and more a game of exploration.  There are a few magical words
-in the game, but on the whole, simple English
+is an adventure game in the classic style.
+However, it's slightly less of a puzzle and more a game of exploration.
+There are a few magical words in the game, but on the whole, simple English

 should suffice to make one's desires understandable to the parser.
 .Sh THE SETTING
 should suffice to make one's desires understandable to the parser.
 .Sh THE SETTING

-In the days before the darkness came, when battlestars ruled the
-heavens...
+In the days before the darkness came, when battlestars ruled the heavens...

 .Bd -literal -offset indent
 Three He made and gave them to His daughters,
 Beautiful nymphs, the goddesses of the waters.
 .Bd -literal -offset indent
 Three He made and gave them to His daughters,
 Beautiful nymphs, the goddesses of the waters.


@@ -61,19 +55,18 @@ Two to wash the lands and churn the waves asunder,
 Three to rule the world and purge the skies with thunder.
 .Ed
 .Pp
 Three to rule the world and purge the skies with thunder.
 .Ed
 .Pp

-In those times great wizards were known and their powers were beyond
-belief.  They could take any object from thin air, and, uttering the
-word 
+In those times great wizards were known and their powers were beyond belief.
+They could take any object from thin air, and, uttering the word

 .Sq su
 could disappear.
 .Pp
 .Sq su
 could disappear.
 .Pp

-In those times men were known for their lust of gold and desire to
-wear fine weapons.  Swords and coats of mail were fashioned that could
-withstand a laser blast.
+In those times men were known for their lust for gold and desire to
+wear fine weapons.
+Swords and coats of mail were fashioned that could withstand a laser blast.

 .Pp
 .Pp

-But when the darkness fell, the rightful reigns were toppled.  Swords
-and helms and heads of state went rolling across the grass.  The entire
-fleet of battlestars was reduced to a single ship.
+But when the darkness fell, the rightful reigns were toppled.
+Swords and helms and heads of state went rolling across the grass.
+The entire fleet of battlestars was reduced to a single ship.

 .Sh SAMPLE COMMANDS
 .Bd -literal -offset indent
 take   ---     take an object
 .Sh SAMPLE COMMANDS
 .Bd -literal -offset indent
 take   ---     take an object


@@ -82,22 +75,22 @@ drop        ---     drop an object
 wear   ---     wear an object you are holding
 draw   ---     carry an object you are wearing
 
 wear   ---     wear an object you are holding
 draw   ---     carry an object you are wearing
 

-puton  ---     take an object and wear it
+put on ---     take an object and wear it

 take off --    draw an object and drop it
 
 take off --    draw an object and drop it
 

-throw  <object> <direction>
+throw  \*[Lt]object\*[Gt] \*[Lt]direction\*[Gt]

 
 

-!      <shell esc>
+!      \*[Lt]shell esc\*[Gt]

 .Ed
 .Sh IMPLIED OBJECTS
 .Bd -literal -offset indent
 .Ed
 .Sh IMPLIED OBJECTS
 .Bd -literal -offset indent

->-: take watermelon
+\*[Gt]-: take watermelon

 watermelon:
 Taken.
 watermelon:
 Taken.

->-: eat
+\*[Gt]-: eat

 watermelon:
 Eaten.
 watermelon:
 Eaten.

->-: take knife and sword and apple, drop all
+\*[Gt]-: take knife and sword and apple, drop all

 knife:
 Taken.
 broadsword:
 knife:
 Taken.
 broadsword:


@@ -110,40 +103,58 @@ broadsword:
 Dropped.
 apple:
 Dropped.
 Dropped.
 apple:
 Dropped.

->-: get
+\*[Gt]-: get

 knife:
 Taken.
 .Ed
 .Pp
 Notice that the "shadow" of the next word stays around if you
 knife:
 Taken.
 .Ed
 .Pp
 Notice that the "shadow" of the next word stays around if you

-want to take advantage of it.  That is, saying "take knife" and then
-"drop"
+want to take advantage of it.
+That is, saying "take knife" and then "drop"

 will drop the knife you just took.
 will drop the knife you just took.

-.Sh SCORE & INVEN
-The two commands "score" and "inven" will print out your current status
-in the game.
+.Sh SCORE \*[Am] INVEN
+The two commands
+.Dq score
+and
+.Dq inven
+will print out your current status in the game.

 .Sh SAVING A GAME
 .Sh SAVING A GAME

-The command "save" will save your game in a file, by default called
-".Bstar" in your home directory.  You
-can recover a saved game by using the 
+The command
+.Dq save
+will save your game in a file called
+.Pa .Bstar
+in your home directory by default.
+You can recover a saved game by using the

 .Fl r
 option when you start up the
 game, or by giving the name of the saved file as an argument.
 .Fl r
 option when you start up the
 game, or by giving the name of the saved file as an argument.

+Save files will be saved to and restored from your home directory unless a
+path is specified - i.e.,
+.Dq Li battlestar -r savedgame
+will look for
+.Pa savedgame
+in your home directory, but
+.Dq Li battlestar -r ./savedgame
+will look in the current directory.
+.Dq Li battlestar -r
+will look for the default file,
+.Pa .Bstar
+in your home directory.

 .Sh DIRECTIONS
 The compass directions N, S, E, and W can be used if you have a compass.
 If you don't have a compass, you'll have to say R, L, A, or B, which
 stand for Right, Left, Ahead, and Back.
 Directions printed in room descriptions are
 .Sh DIRECTIONS
 The compass directions N, S, E, and W can be used if you have a compass.
 If you don't have a compass, you'll have to say R, L, A, or B, which
 stand for Right, Left, Ahead, and Back.
 Directions printed in room descriptions are

-always printed in R, L, A, & B relative directions.
+always printed in R, L, A, and B relative directions.

 .Sh HISTORY
 I wrote Battlestar in 1979 in order to experiment with the niceties of
 the C Language.
 Most interesting things that happen in the game are hardwired into the
 code, so don't send me any hate mail about it!
 Instead, enjoy art for art's sake!
 .Sh HISTORY
 I wrote Battlestar in 1979 in order to experiment with the niceties of
 the C Language.
 Most interesting things that happen in the game are hardwired into the
 code, so don't send me any hate mail about it!
 Instead, enjoy art for art's sake!

-.Sh AUTHOR
-David Riggle
-.Sh INSPIRATION & ASSISTANCE
+.Sh AUTHORS
+.An David Riggle
+.Sh INSPIRATION \*[Am] ASSISTANCE

 .Bl -item -compact
 .It
 Chris Guthrie
 .Bl -item -compact
 .It
 Chris Guthrie


@@ -153,8 +164,8 @@ Peter Da Silva
 Kevin Brown
 .It
 Edward Wang
 Kevin Brown
 .It
 Edward Wang

-.It 
-Ken Arnold & Company
+.It
+Ken Arnold \*[Am] Company

 .El
 .Sh BUGS
 Countless.
 .El
 .Sh BUGS
 Countless.