Commit Graph
5087 Commits
Author SHA1 Message Date
nhmall c56a76086c some typos spotted in tribute
Changes to be committed:
	modified:   dat/tribute

There are probably more.
2015-06-14 19:59:37 -04:00
nhmall 4c3fca4367 tribute formatting cleanup and additions
Changes to be committed:
	modified:   dat/tribute

I've also added some of Boudewijn's suggestions and
added his name in a comment for easy reference
when validating the content agains the book.
2015-06-14 15:57:19 -04:00
Pasi Kallinen e0cf17e660 Fix the shapechanger fix again 2015-06-14 11:48:10 +03:00
Pasi Kallinen 5d3ca5bb35 Ensure there are candles in Vlad's tower 2015-06-14 10:58:55 +03:00
Pasi Kallinen 0c3ee5025e Shapechangers got a completely random form
mtmp->cham was NON_PM, which select_newcham_form interpreted as a completely
random form.  This also resulted Vlad getting a random shape, and not getting
the Candelabrum, making the game unwinnable.
2015-06-14 10:40:25 +03:00
nhmall 87c22180f2 rolling back after criticism of approach 2015-06-13 22:31:31 -04:00
nhmall fc2ea1bf93 more tribute fixup
One book had the top and bottom credits.
2015-06-13 21:20:08 -04:00
nhmall 8b9667e8fb typo on quote count for Reaper Man
Changes to be committed:
	modified:   dat/tribute
2015-06-13 21:07:28 -04:00
nhmall 13bc96ca98 avoid error
The presence of [...] in middle of tribute quote
wasn't handle correctly in the new formatting code.
2015-06-13 20:59:40 -04:00
nhmall fb09ce0a22 more quotes - Reaper Man
Changes to be committed:
	modified:   dat/tribute
2015-06-13 19:46:06 -04:00
nhmall 58f3611ec1 Ensure more consistent formatting of tribute passages
Changes to be committed:
	modified:   src/files.c
2015-06-13 19:18:01 -04:00
nhmall e3850d8606 start new tribute content handling 2015-06-13 09:33:40 -04:00
nhmall 37f0eafa93 support for link-time option in #version
Changes to be committed:
	modified:   src/version.c
	modified:   sys/share/cppregex.cpp
	modified:   sys/share/pmatchregex.c
	modified:   sys/share/posixregex.c
	modified:   util/makedefs.c

Some options in 3.6.0 are determined by what you link with.
The choice of regex support is one.
Let #version show that linked option along with the compile-time options.
2015-06-12 19:23:18 -04:00
nhmall 5e913f90f8 Makefile typos in sys/winnt/Makfile.msc 2015-06-12 15:42:41 -04:00
Pasi Kallinen 6439e46413 Copypaste mistake: Message types, not menu colors. 2015-06-12 20:32:35 +03:00
nhmall f93059bcb6 beta complaint 2 (again) 2015-06-12 13:11:10 -04:00
nhmall 37643001b6 beta complaint 2 2015-06-12 13:08:51 -04:00
nhmall bfb4ce4dd6 beta complaints 1 2015-06-12 12:59:30 -04:00
PatR 0bf3231f29 role selection: priest/priestess' prompt
Change "Shall I pick your priest/priestess' race, gender, ..." prompt
to "... priest/priestess's ...".

Unfortunately that makes it long enough to push the cursor onto the
next line for basic 80 column display.  If caveman/cavewoman's wasn't
already longer I think I would have left the clumsier phrasing/spelling.
2015-06-11 18:47:57 -07:00
PatR af54125c22 characteristics disclosure
Change end of game disclosure's display for strength, dexterity, &c to
always show the maximum possible value instead of only when the final
value was less than maximum.  For both end of game and ^X, change the
description from "limit" to "innate limit" if the current value exceeds
limit due to worn items (gauntlets of power, +N ring of adornment, &c).
2015-06-11 18:19:09 -07:00
nhmall f2daf4f7f8 punctuation in failed messages 2015-06-11 21:11:41 -04:00
PatR 12c013ee28 more menustyle
Make the list of menustyle values in the game match their order in the
revised documentation:  traditional, combination, full, partial.
2015-06-11 14:09:17 -07:00
PatR 9bf715c815 menustyle documentation
Reorder the description of the values for the menustyle option, swapping
'full' and 'partial' since 'full' is closer in operation to 'combination'.
2015-06-11 13:35:41 -07:00
Pasi Kallinen 4ead443847 Remove unused variable 2015-06-11 19:36:08 +03:00
Pasi Kallinen 183bf0fbf2 Fix unused variable thinko 2015-06-11 19:34:49 +03:00
nhmall 2e3a109826 alter beta identifier 2015-06-11 08:25:56 -04:00
nhmall a3b1833ab9 menucolors
Error reported in display.c in current master code is gone,
but the menucolors stuff generated the following warnings when TEXTCOLOR wasn't defined.

..\win\tty\wintty.c(1688) : warning C4013: 'term_start_color' undefined; assuming extern returning int
..\win\tty\wintty.c(1711) : warning C4013: 'term_end_color' undefined; assuming extern returning int
2015-06-10 21:07:19 -04:00
nhmall 0fd193838a punctuation in dat/tribute 2015-06-10 20:52:03 -04:00
nhmall 00d25adab2 actual field is always around anyway
Changes to be committed:
	modified:   include/flag.h
2015-06-10 20:48:29 -04:00
nhmall 4c3abcbd11 more tribute quotes
Changes to be committed:
	modified:   dat/tribute
2015-06-10 20:36:17 -04:00
PatR c9013bdc6a tribute passage 'summary'
When reading a passage from a tribute novel, put the final attribution
line "[$TITLE, by Terry Pratchett]" into message history, comparable to
the summary line for deliver-by-window quest messages.
2015-06-10 16:23:19 -07:00
nhmall f446e1477c Files didn't match sys/unix/hints
Changes to be committed:
	modified:   Files
2015-06-10 19:15:36 -04:00
nhmall cff16290af Merge branch 'macosx-build' 2015-06-10 18:57:23 -04:00
nhmall 18e7d6ff62 another punctuation bit 2015-06-10 08:10:56 -04:00
nhmall 8032eb111f punctuation bit 2015-06-10 08:09:03 -04:00
nhmall 4b79a03125 more quotes from books without quotes 2015-06-10 07:56:12 -04:00
PatR 1592cb3d10 tribute: The Last Hero
Flesh out _The_Last_Hero_.  Due to its publishing history (no ordinary
paperback, some lists of "other books by this author" miscategorize it
as being co-written by the illustrator) it's most likely not as widely
read as the other Discworld books.
2015-06-10 00:54:07 -07:00
nhmall b9ab9aae2a use NO_GLYPH as an indicator to ignore background glyph
Changes to be committed:
	modified:   doc/window.doc
	modified:   src/display.c
2015-06-09 21:56:28 -04:00
nhmall b2f9ba5de3 default to original background
Changes to be committed:
	modified:   src/display.c

The work for getting this working fully is now moving to the background_tiles branch.
In master, we just return the standard lit room tile for now, no change in behavior.
No ports utilize the new parameter as yet.
2015-06-09 21:33:08 -04:00
Pasi Kallinen b4cc349a46 X11: Hilight piles of objects 2015-06-09 19:59:38 +03:00
Pasi Kallinen e15f7be909 Add the mapglyph special flags to window doc 2015-06-09 17:46:30 +03:00
Pasi Kallinen 174e6f47b3 TTY: Hilight piles of objects
Add MG_OBJPILE flag, which windowports can use to check if a location
has more than one object stack. If use_inverse is on, TTY will use
inverse to show such piles.  If a boulder is the topmost item on a pile,
then the object pile flag is not used; mainly because boulders are "solid",
boulders dropped by monsters are nearly always over other objects, and so
that special levels such a Sokoban can "hide" items under the boulders.

TODO: a "pilemark", analogous to "petmark", perhaps a green plus sign,
which can be used by windowports with tiles.
2015-06-09 16:54:48 +03:00
nhmall 580d98b473 many contributors to this please
Changes to be committed:
	modified:   doc/Guidebook.mn
	modified:   doc/Guidebook.tex
2015-06-09 05:29:25 -04:00
nhmall d5631bc448 Merge branch 'master' into AlexK-misc 2015-06-08 21:11:54 -04:00
nhmall 85e80f1e3e provide bkglyphs
Changes to be committed:
	modified:   src/display.c
2015-06-08 20:10:43 -04:00
nhmall c3a77914a9 Modify the window interface for print_glyph
Changes to be committed:
	modified:   doc/window.doc
	modified:   include/qt_win.h
	modified:   include/trampoli.h
	modified:   include/winX.h
	modified:   include/wingem.h
	modified:   include/winprocs.h
	modified:   include/wintty.h
	modified:   src/display.c
	modified:   src/windows.c
	modified:   sys/amiga/winami.p
	modified:   sys/amiga/winfuncs.c
	modified:   sys/amiga/winproto.h
	modified:   sys/wince/mswproc.c
	modified:   sys/wince/winMS.h
	modified:   win/Qt/qt_win.cpp
	modified:   win/X11/winmap.c
	modified:   win/chain/wc_chainin.c
	modified:   win/chain/wc_chainout.c
	modified:   win/chain/wc_trace.c
	modified:   win/gem/wingem.c
	modified:   win/gem/wingem1.c
	modified:   win/gnome/gnbind.c
	modified:   win/tty/wintty.c
	modified:   win/win32/mswproc.c
	modified:   win/win32/winMS.h

print_glyph now takes a second parameter.

Tiles on tiled ports always looked odd on places like the plane of air
where the background color of the tile didn't match the general background
of the surrounding area.

3.6 made that even worse and more glaringly noticeable with the introduction
of darkened room tiles.

The code to actually send something useful through the new parameter
for window ports to take advantage if they want will follow.
2015-06-08 19:37:26 -04:00
Pasi Kallinen 9070d129de Use MAKE variable instead of hardcoding make 2015-06-06 20:25:32 +03:00
Alex Kompel 6d8a591fc1 Chatting with priest converted to minion crashes the game (few code paths in priest_talk() assumed the priest has an altar) 2015-06-06 08:16:30 -07:00
PatR 4453ecac64 lookat again
Remove second 'alt_i' initialization, which was first in implementation.
Superseded by the preceding line, which came later.  Works either way,
but the conditional initalization avoids the two extra loop iterations
when they're not useful.
2015-06-05 23:37:02 -07:00
PatR 7218f2bfbd lookat issues for unknown/solid rock/dark room
Fix two things with the ';' and '/' commands, both for looking at blank
space.  The list of possibilies included "a dark part of a room or the
dark part of a room" even though the code involved goes out of its way
to avoid redundant clauses.  S_stone let dark part be prefixed by 'a',
S_room and S_darkroom forced it to be 'the' which is better phrasing
but outsmarted the redundancy check.  Make S_stone's use of "dark part
of a room" force 'the' too.

That's trivial; this is more complicated:  the new maze variations
exposed/aggravated an issue that's been there all along.  In a non-
WALLIFIED maze, doing look-at on the solid stone in-place-of-wall
next to you reported "dark part of a room" which is clearly wrong when
you can tell it's not a room.  (The same thing happens in any ordinary
corridor, but players rarely try to identify blank space next to them
it that circumstance so it hasn't mattered very much.)  This change
results in look-at listing "unexplored" and "stone" as additional
possibilities when looking at blank spots.  Final description will be
"unexplored" instead of dark room if you haven't seen the spot, "stone"
if you have and that's what it is, or "dark part of a room" otherwise.
2015-06-05 20:19:18 -07:00