Commit Graph

436 Commits

Author SHA1 Message Date
Pasi Kallinen
03a1fcfc56 Put Rogue quest home monsters on the "streets" 2015-05-02 19:27:05 +03:00
Pasi Kallinen
b234c7032f Make the Valley have slight variations 2015-05-02 18:29:35 +03:00
Derek S. Ray
9c8f4d1fad ensure that the 'safe' objects remain safe
since Elbereth doesn't work if you're not on the square anymore, we need
to make sure that critters are discouraged from grabbing the sokoban
prize or the castle wand.

also, fix up the level compiler makefiles so that uncommenting the
YACC/LEX definitions (presuming you have the right tools installed)
works properly.
2015-04-29 19:07:24 -04:00
PatR
d65fba4ebe do_look bits
I didn't find Michael's crasher, but I did find a couple of minor
problems:

knight's saddled pony wasn't found in the file lookup either though
there is an entry for pony ("tame saddled <foo>" stripped off "tame "
but not "saddled "; "saddled <foo>" would only be found of there was
a wildcard entry key of "*<foo>", like "*horse" to catch both horse
and warhorse);

"wombat" matched the bat entry rather than reporting an unknown
entity.
2015-04-23 19:25:01 -07:00
Pasi Kallinen
a155d1d474 Solidify the astral plane
...to prevent xorns appearing in the inaccessible map fringes
2015-04-21 11:22:34 +03:00
Pasi Kallinen
879f6d55c2 Add Auto open doors -patch 2015-04-13 21:11:44 +03:00
Pasi Kallinen
ee5002210f Fix gitignored 2015-04-13 08:30:47 +03:00
nhmall
11560933cc Merge branch 'master' into nhmall-booktribute
Conflicts:
	doc/fixes35.0
	include/extern.h
	src/mkobj.c
	src/mon.c
	src/objnam.c
	win/share/objects.txt
2015-04-12 10:02:17 -04:00
nhmall
2f4e7b601d text file error corrections
Changes to be committed:
	modified:   DEVEL/code_features.txt
	modified:   Files
	modified:   dat/history

On 4/11/2015 6:45 PM, Dion Nicolaas wrote:
> Errors in text files:
> - DEVEL/code_features.txt, line 10: 'alterting' should be 'alerting'

fixed

> - dat/history: Is it intentional that I'm no longer mentioned as
> maintaining the Windows port? I am for 3.4, but not for 3.6.

fixed

> - Files: The Files file is incomplete. Notably, the new files in dat/
> are missing (bogusmon.txt, engrave.txt, epitaph.txt),

fixed

> the DEVEL directory, doc/Guidebook.*

> - Some files in Files have the wrong case: NetHack.sln,
> NetHackW.vcxproj. I know it doesn't matter on windows but it looks wrong.

fixed
2015-04-11 21:02:11 -04:00
nhmall
7e098c0c4e Merge branch 'master' into nhmall-booktribute 2015-04-10 12:15:14 -04:00
Pasi Kallinen
c266d05680 Minor special level and compiler tweakage
Fix allowed map characters.
Make some predefined MAPs blend in better with randomly
generated parts.
2015-04-10 16:47:32 +03:00
Sean Hunt
0edd645384 Fix Sanctum phasing bug. 2015-04-10 09:14:23 -04:00
Sean Hunt
f523055746 Make WALLIFIED_MAZE into a level flag.
It should now be randomly disabled for a 3rd of Gehennom, to make things
a tad more interesting there. It's also disabled in Baalzebub's lair,
to make things a little more interesting.

Still don't know why the beetle is disappearing.
2015-04-09 13:27:44 -04:00
Pasi Kallinen
5cf86e0409 Add 2 new Medusa variants 2015-04-08 20:38:32 +03:00
Pasi Kallinen
ea084680ac Add 10 new bigroom variants 2015-04-08 18:31:32 +03:00
Sean Hunt
05c284b2e8 Add quotes for Eric and Moving Pictures. 2015-04-07 12:48:55 -04:00
karnov
0f246b70d3 Adding quotes for The Light fantastic 2015-04-06 21:46:51 -04:00
karnov
0822995557 Reformat and passage for The Truth 2015-04-06 19:03:38 -04:00
nhmall
8b6736c57b update passage count on title line for The Colour of Magic 2015-04-05 00:08:34 -04:00
karnov
0270dd7a6b Passages for The Colour of Magic 2015-04-04 23:41:29 -04:00
nhmall
fff3b12de0 Merge branch 'nhmall-booktribute' of https://rodney.nethack.org:20040/git/NHsource into nhmall-booktribute 2015-04-04 08:22:05 -04:00
Sean Hunt
4e8e1889ef Add some quotes.
Please correct the formatting if need be.
2015-04-04 00:39:24 -04:00
nhmall
c43e8f9d31 Merge branch 'master' into nhmall-booktribute
Conflicts:
	include/context.h
2015-04-02 19:19:50 -04:00
Pasi Kallinen
5bbde14a39 Generate oracle monsters after subroom 2015-04-01 19:02:52 +03:00
Pasi Kallinen
a883d3c78b Generate minetown guards after subrooms 2015-04-01 19:00:56 +03:00
Pasi Kallinen
323b8b4038 Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource into paxed-new_lev_comp
Conflicts:
	src/trap.c
	sys/winnt/Makefile.msc
2015-04-01 16:09:53 +03:00
keni
8ee2d5976e NHDT substitution version 2.
Re-run nhgitset.pl to install.
"perldoc DEVEL/hooksdir/nhsub" for details.  General docs still to come.
Quick notes:
- "git nhsub" lets you apply substitutions to a file without involving any
  version control.
- When doing nhadd/nhcommit, the working directory WILL reflect the results
  of the substitutions.
Let's see what this breaks.
2015-03-31 09:50:02 -04:00
Pasi Kallinen
9f605ed2b3 Moving clouds on the plane of air
Reusing the plane of water air bubbles code
2015-03-31 11:46:46 +03:00
PatR
f0eae55d34 add .gitignore entries: tile.h, NetHack.ad
Add a couple of missing .gitignore entries for files put into
place when building.  include/tile.h is genearated for tiles
and dat/NetHack.ad is copied for X11 resource definitions.
2015-03-31 00:18:00 -07:00
Pasi Kallinen
e305b8a51e New T-shirt texts, bogusmon, one YAFM 2015-03-30 17:09:12 +03:00
nhmall
2c9ad065c1 add data.base suggestion for whistle
On 1/24/2014 6:48 AM, a bug reporter wrote:
> The whistle in Nethack has no encyclopedia entry. I suggest for the next
> release something from the M. R. James ghost story 'Oh, Whistle, and I'll Come
> to You My Lad'.
>
2015-03-29 10:50:39 -04:00
Pasi Kallinen
1e49567937 Use dark gray color for black glyphs in TTY
This is Michael Deutschmann's use_darkgray -patch.
Adds a boolean option use_darkgray, settable in config file.

This patch has been in use on NAO for years, and I have heard
once someone say their terminal didn't support the dark gray
color.
2015-03-29 15:51:11 +03:00
nhmall
76ee82b7d3 more doc updates
Changes to be committed:
	modified:   dat/history
	modified:   doc/Guidebook.mn
	modified:   doc/Guidebook.tex
2015-03-27 19:47:17 -04:00
nhmall
7d4298655d names of public servers and tournament contrib
Changes to be committed:
	modified:   dat/history
2015-03-26 08:05:23 -04:00
Pasi Kallinen
2649cb385c Merge branch 'master' into paxed-new_lev_comp
Conflicts:
	.gitignore
	doc/fixes35.0
	include/obj.h
	include/patchlevel.h
	src/dig.c
	src/mklev.c
	src/rumors.c
	src/save.c
	src/topten.c
	src/trap.c
	sys/winnt/Makefile.msc
	util/makedefs.c
	win/win32/levstuff.mak
2015-03-21 19:39:48 +02:00
nhmall
a0d3224834 Merge branch 'master' into nhmall-booktribute
Conflicts:
	sys/winnt/Makefile.msc
2015-03-21 10:59:49 -04:00
nhmall
d7ff451301 More book tribute integration 2015-03-21 10:33:59 -04:00
Derek S. Ray
7f03ee4216 Changes for Win32; update precompiled files
Also fix Orctown probabilities; fixed support for snprintf;
update Win32 makefile to allow level compiler use

Conflicts:
	win/win32/levstuff.mak
2015-03-20 15:14:31 +02:00
Derek S. Ray
b1835cc65d Swap out Frontier Town with Orctown 2015-03-20 15:09:51 +02:00
nhmall
b342beea2b skeleton tribute text file 2015-03-20 01:07:59 -04:00
Pasi Kallinen
384f519cc8 Add lots of new random epitaphs 2015-03-19 22:01:16 +02:00
Pasi Kallinen
1fd371600d Add some new random engravings 2015-03-19 21:13:24 +02:00
Pasi Kallinen
f5ea4e0d1f Add lots of new hallu monsters 2015-03-19 18:43:35 +02:00
PatR
357115ae80 add bogusmon,engrave,epitaph to dat/.gitignore 2015-03-18 19:24:43 -07:00
Pasi Kallinen
debdf7ca48 Move some hard-coded string arrays into data files.
Random epitaphs, engravings and hallucinatory monsters now
live in text data files.
2015-03-18 22:05:10 +02:00
nhmall
c80828fe7a Start to prepare dat/history for release
This gets the history started. Please review/correct/improve and
fill in the various <FIXME> items I've flagged.
2015-03-17 22:40:57 -04:00
Pasi Kallinen
56699486a0 Catch up with post-343 lev_comp changes
- Iced pools vs. iced moats
- allow making map outer edges nonpasswall & nondiggable,
  so eg. xorns cannot be teleported there
2015-03-17 18:57:39 +02:00
Pasi Kallinen
b5dd0c1894 Make sokoban prize not depend on the map layout 2015-03-17 18:52:53 +02:00
Pasi Kallinen
c9d5bb9d68 Fix some level flags, sokoban premapping 2015-03-17 18:52:53 +02:00
Pasi Kallinen
79eb17a0a7 New level compiler: des-file changes 2015-03-17 18:52:49 +02:00