Commit Graph
652 Commits
Author SHA1 Message Date
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
nhmall ae974e7a6d dungeoneers update March 16, 2015 2015-03-17 18:47:37 +02:00
Pasi Kallinen 63e7d97148 Change command X to twoweapon toggle
Explore mode is now an extended command #exploremode.
There's no sense that a command used max. once per game, and
in normal games not at all, takes up a key. So, analogous to
the 'x' command (swap weapons), 'X' now toggles two-weapon
combat.
2015-03-17 18:47:20 +02:00
Pasi Kallinen 7d8d8ad1f5 Add database entry for land mine 2015-03-17 18:47:16 +02:00
Pasi Kallinen 587d1678f7 Add database entry for fedora 2015-03-17 18:47:15 +02:00
Pasi Kallinen cf66f8bceb Make shuriken entry also match throwing star. 2015-03-17 18:47:15 +02:00
Pasi Kallinen aeb3b49549 Fix shuriken attribution 2015-03-17 18:47:15 +02:00
Pasi Kallinen f0114b2ead Add database entry for shuriken 2015-03-17 18:47:15 +02:00
Pasi Kallinen 08eebb58e1 Fix data.base entries
-"bat" overrode later "combat" entry.
 -"gelatinous cube" and "jack boot" have their own entries.
 -"vampire bat" matched twice; use the bat entry.
 -dagger attribution started with spaces instead of tabs.
2015-03-17 18:47:15 +02:00
Pasi Kallinen f56b880e0a Remove last mention of EXP_ON_BOTL 2015-03-17 18:46:53 +02:00
Sean Hunt 5fb3fea9c6 Remove experimental Unicode support.
This reverts commit 7f0f43e6f9 and some related
subsequent commits.

This compiles, but I have not done extensive testing.

Conflicts:
	include/config.h
	include/decl.h
	include/extern.h
	include/global.h
	include/tradstdc.h
	include/wintty.h
	src/drawing.c
	src/files.c
	src/hacklib.c
	src/mapglyph.c
	src/options.c
	sys/winnt/nttty.c
	win/tty/getline.c
	win/tty/topl.c
	win/tty/wintty.c
2015-03-17 18:46:45 +02:00
Sean Hunt ffd201495c Make REINCARNATION unconditional.
There is a lot of code affected by this, and Pat Rankin correctly
observes that it would be better to store roguelike as a level flag
rather than just using Is_rogue_level. A note for the future.
2015-03-17 18:46:08 +02:00
Sean Hunt 44ca9fc16a Make SINKS unconditional. 2015-03-17 18:45:58 +02:00
Sean Hunt aba6ecb7b3 Make ELBERETH unconditional. 2015-03-17 18:45:45 +02:00
keni 25cd007c48 Bulk recovery of file CVS headers and addition of NHDT- headers. 2015-03-17 18:45:12 +02:00
keni 55a9ad84de Add .gitattribute files. 2015-03-17 18:44:59 +02:00
Derek 4c496d089e Exclude all the Win32 build artifacts (Studio and otherwise)
Squashed commit of the following:

commit e37c7626f035a29321c9ac12cca83a0af2132abb
commit 86ebb3e66aedb6b5a31d61d57c39cf84c12d2276
commit 6cd677c8fca4102f223fb1708d00a65c2ded6658
Author: Derek <derekray@gmail.com>
Date:   Fri Feb 13 13:24:29 2015 -0500
2015-03-17 18:44:53 +02:00
keni 041045a890 Typo 2015-03-17 18:44:53 +02:00
nhmall c24dcf76b2 dungeoneers update March 16, 2015 2015-03-16 06:04:43 -04:00
Pasi Kallinen 560898d3d4 Change command X to twoweapon toggle
Explore mode is now an extended command #exploremode.
There's no sense that a command used max. once per game, and
in normal games not at all, takes up a key. So, analogous to
the 'x' command (swap weapons), 'X' now toggles two-weapon
combat.
2015-03-09 22:53:43 +02:00
Pasi Kallinen 44c0534a97 Add database entry for land mine 2015-03-05 16:34:16 +02:00
Pasi Kallinen 4cc1316163 Add database entry for fedora 2015-03-05 16:15:40 +02:00
Pasi Kallinen cc25d29490 Make shuriken entry also match throwing star. 2015-03-05 14:23:23 +02:00
Pasi Kallinen c427f450ca Fix shuriken attribution 2015-03-05 14:22:19 +02:00
Pasi Kallinen 40851d2e69 Add database entry for shuriken 2015-03-05 14:21:21 +02:00
Pasi Kallinen e37d4224b3 Fix data.base entries
-"bat" overrode later "combat" entry.
 -"gelatinous cube" and "jack boot" have their own entries.
 -"vampire bat" matched twice; use the bat entry.
 -dagger attribution started with spaces instead of tabs.
2015-03-05 14:03:56 +02:00
Pasi Kallinen 7cbd2fd592 Remove last mention of EXP_ON_BOTL 2015-03-01 10:26:24 +02:00
Sean Hunt a3faa93403 Remove experimental Unicode support.
This reverts commit 7f0f43e6f9 and some related
subsequent commits.

This compiles, but I have not done extensive testing.

Conflicts:
	include/config.h
	include/decl.h
	include/extern.h
	include/global.h
	include/tradstdc.h
	include/wintty.h
	src/drawing.c
	src/files.c
	src/hacklib.c
	src/mapglyph.c
	src/options.c
	sys/winnt/nttty.c
	win/tty/getline.c
	win/tty/topl.c
	win/tty/wintty.c
2015-02-27 19:34:29 -05:00
Sean Hunt 1edadd1d48 Make REINCARNATION unconditional.
There is a lot of code affected by this, and Pat Rankin correctly
observes that it would be better to store roguelike as a level flag
rather than just using Is_rogue_level. A note for the future.
2015-02-27 19:33:16 -05:00
Sean Hunt 5ee71d2757 Make SINKS unconditional. 2015-02-27 19:33:06 -05:00
Sean Hunt 264dc66129 Make ELBERETH unconditional. 2015-02-27 19:32:53 -05:00
keni 03140969ee Bulk recovery of file CVS headers and addition of NHDT- headers. 2015-02-26 09:19:03 -05:00
keni 9480f880c4 Add .gitattribute files. 2015-02-26 08:54:12 -05:00
keni aed830f493 Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource 2015-02-13 17:37:36 -05:00
keni b87b568f72 Typo 2015-02-13 17:37:06 -05:00