Commit Graph
100 Commits
Author SHA1 Message Date
Pasi Kallinen 19fe4ece8c Move struct istat_s above prototypes using it 2015-06-03 17:41:01 +03:00
Pasi Kallinen cf28b8ad71 Fix Rogue-level lighting bugs caused by dark room
Found by Boudewijn
2015-06-03 17:27:40 +03:00
Pasi Kallinen 13ef4962fd Reduce the number of gnomes with candles
Gnomes in mines during level generation have 1/20 chance of getting a candle
(should give approximately 4 candles in all of the mines total), and every
randomly generated gnome has 1/60 chance.
2015-06-01 15:59:43 +03:00
Pasi Kallinen 36f00f98eb Use a menu to pick a container to tip
If there is more than one container, the #tip command will show a menu;
if there's just one container, prompt for tipping.

As per Boudewijn's suggestion, remove the superfluous
"There is a container here" message.
2015-05-31 10:13:53 +03:00
Pasi Kallinen b8c752f269 Add vibrasquare symbol to Guidebooks 2015-05-29 22:47:39 +03:00
Pasi Kallinen 4c43b88732 Renumber glyphs for vibrasquare trap conversion 2015-05-29 22:42:11 +03:00
Pasi Kallinen 8c5796ff6e Fix typo in potion dilution message, found by Raisse 2015-05-29 13:20:20 +03:00
Pasi Kallinen 2944dc6935 Show cost of merchandise when walking over it
This is another feature the betatesters seemed to miss a lot.
2015-05-27 21:45:00 +03:00
Pasi Kallinen b2291aaf93 Make options-menu more uniform 2015-05-27 20:51:40 +03:00
Pasi Kallinen 773eecc472 Rename omit_buc option to implicit_uncursed
... so the name is less cryptic.
2015-05-27 20:43:22 +03:00
Pasi Kallinen f0eca282a8 Add MSGTYPE config option
MSGTYPE allows the user to define how messages in the message
area behave. For example:

  MSGTYPE=stop "You swap places with "

would always make that message prompt for -more-.  Allowed types
are "show" (normal message), "hide" (do not show), "stop" (wait
for user), and "norep" (do not repeat message).

Adding this, because it's relatively simple, proven to work, and
it seemed to be the major thing betatesters felt was lacking when
compared to NAO.
2015-05-27 20:21:57 +03:00
Pasi Kallinen 5fabcdf692 Add omit_buc -option
The option defaults to on, which is the old-style behaviour.
Turning the option off will never omit the "uncursed" -status
from inventory lines. This is pretty much required if users
want to use menucolors based on the BUC state.
2015-05-27 12:46:35 +03:00
Pasi Kallinen 29ecd78efc Fix squeaky board creation segfault
If a trap is created on top of another trap, maketrap reuses
the trap struct in place, instead of deleting and recreating it.

If a squeaky trap was created on top of another trap, maketrap
first set the trap type to squeaky board, and then tried to
look through all squeaky boards on the level, to determine
what note the new trap should play. Unfortunately, the union
with the trap note most likely contained a rolling boulder
coordinate or something else outside the 12 note range, so
then the tavail-array lookup would cause a segfault.
2015-05-25 22:03:04 +03:00
Pasi Kallinen fd1932075e Fix dark room glyphs on level re-entry 2015-05-25 10:02:09 +03:00
Pasi Kallinen 29ea460446 Used invent letters didn't destroy the window 2015-05-07 18:04:40 +03:00
Pasi Kallinen b8e0394a2e Hidden holes made by breaking a wand of digging
Holes created via applying a wand of digging were not
shown on the map, because holes are always marked as seen,
and seetrap/feeltrap then do nothing.
2015-05-06 18:02:15 +03:00
Pasi Kallinen 2a4bf5efa7 Comment for the pudding glob order 2015-05-06 09:54:28 +03:00
Pasi Kallinen fd8127dcf4 Fix impossible when quivered gold was stolen from you 2015-05-05 21:29:24 +03:00
Pasi Kallinen 0dd715da11 Revert previous, with a comment in code 2015-05-05 06:55:56 +03:00
Pasi Kallinen 766d874a47 Melded pudding object may be gone 2015-05-04 22:19:32 +03:00
Pasi Kallinen be60ad6676 Randomize secret door locations
... in the Wizard quest locate level and Rodney tower entrance
2015-05-03 10:31:30 +03:00
Pasi Kallinen 15a5fe8d76 Barb quest home has a forest 2015-05-03 08:56:39 +03:00
Pasi Kallinen d44e55b9a2 Make the slanted bigrm have more variance 2015-05-02 23:23:04 +03:00
Pasi Kallinen b950031f55 Occasionally fog maze bigrm is not made of fog 2015-05-02 23:19:38 +03:00
Pasi Kallinen 862c78530b More variations for bigrm-1 2015-05-02 23:04:13 +03:00
Pasi Kallinen 5d116a892a Minor variation for Earth and Astral planes 2015-05-02 22:17:47 +03:00
Pasi Kallinen 816b562e99 Replace some pools in Hea quest home with floor 2015-05-02 22:10:07 +03:00
Pasi Kallinen 7fc44412f9 More minetown and mine end variation 2015-05-02 22:04:40 +03:00
Pasi Kallinen 1746131f60 Make Monk quest home match Priest one 2015-05-02 21:20:36 +03:00
Pasi Kallinen 655611c6ab Add random trees to Ranger quest home 2015-05-02 21:04:19 +03:00
Pasi Kallinen e05a9655db Random holes in the walls of Sam quest goal 2015-05-02 20:55:32 +03:00
Pasi Kallinen 04bea10298 Random melted spots in Valk quest home 2015-05-02 20:47:02 +03:00
Pasi Kallinen 1b0e806f72 Add some clouds to the Wiz quest 2015-05-02 20:29:15 +03:00
Pasi Kallinen 37d76d1ea5 Add trees to Priest quest home level 2015-05-02 19:54:45 +03:00
Pasi Kallinen 03a1fcfc56 Put Rogue quest home monsters on the "streets" 2015-05-02 19:27:05 +03:00
Pasi Kallinen 537acc98dc Update pregenerated levcomp lex and yacc files 2015-05-02 18:33:14 +03:00
Pasi Kallinen b234c7032f Make the Valley have slight variations 2015-05-02 18:29:35 +03:00
Pasi Kallinen 8f639796d5 Handle boulder-option in config file
Setting boulder in config file did not work correctly in post-3.4.3
code, due to the symset changes.
2015-05-01 22:03:13 +03:00
Pasi Kallinen 40080817ce Uninitialized variable 2015-05-01 14:52:25 +03:00
Pasi Kallinen fdda06f678 Initialize variable 2015-05-01 11:55:15 +03:00
Pasi Kallinen 9edec13063 Extract ball and chain before flooreffects 2015-04-29 20:35:49 +03:00
Pasi Kallinen 0d3c858452 Check for valid coord in obj_nexto_xy 2015-04-29 17:04:49 +03:00
Pasi Kallinen b8cfa9b33f Prevent monsters throwing items out of map
If a monster was in the projectile's path, the projectile stopping
checks would not be reached.  The thrown object could fly up to
the maximum range, through walls, or even outside the map.
2015-04-29 16:28:05 +03:00
Pasi Kallinen d768887385 Unquiver gold before making it vanish
This fixes a complaint for "deleting worn obj":  If reading a cursed
spellbook took your money, and the gold was quivered.
2015-04-28 22:14:23 +03:00
Pasi Kallinen f83523eeb4 Make spell list title obey menu_headings 2015-04-28 14:13:01 +03:00
Pasi Kallinen d9ac7f3de7 Exclude "grey" from color picker menu 2015-04-28 12:46:39 +03:00
Pasi Kallinen 86dc5cf588 Unify getting terrain under drawbridge 2015-04-27 22:15:23 +03:00
Pasi Kallinen 0903df974f Unify guards yelling 2015-04-27 21:31:25 +03:00
Pasi Kallinen f0699b76d9 Add is_watch define for watchmen 2015-04-27 21:09:26 +03:00
Pasi Kallinen 93cbd1fbb1 Allow all text attributes for menu_headings 2015-04-27 18:44:18 +03:00
Pasi Kallinen eecd19caa9 Allow changing menucolors in-game via Options 2015-04-27 17:45:48 +03:00
Pasi Kallinen 4fa3c39b55 Show only beginning of annotation when redoing it 2015-04-27 16:18:59 +03:00
Pasi Kallinen 467ee34b2f Prevent possible buffer overflow
getlin() gets at most a BUFSZ string from user; make the buf big
enough to hold that _and_ the query itself.
2015-04-26 16:15:44 +03:00
Pasi Kallinen 54a22d39ea Add level annotating to the Call menu
Via UnNetHack
2015-04-26 11:29:59 +03:00
Pasi Kallinen f28ba6f131 Show level annotation when overwriting existing one
Idea by Chris Smith, via UnNetHack
2015-04-26 11:10:38 +03:00
Pasi Kallinen cc5274d0b6 Mung annotation spaces 2015-04-26 10:57:21 +03:00
Pasi Kallinen 4e067f5f2b Show level annotation on level entry
Idea by Chris Smith, via Unnethack
2015-04-26 10:46:42 +03:00
Pasi Kallinen 5828d17eef Show only the short automatic glyph description
When you turn on the automatic description of a glyph under cursor,
we want to show the short description of what glyph it actually is.
The long full description of all possibilities is far too long, so
may cause more-prompts, and is awkward for blind players.
2015-04-25 15:19:19 +03:00
Pasi Kallinen 5479a0b44c Also allow q at the Itemized billing -prompt
Original change via AceHack by Alex Smith
2015-04-25 12:56:55 +03:00
Pasi Kallinen 672ef5223a Fix adding doors to levels 2015-04-25 12:00:44 +03:00
Pasi Kallinen 8e6dde226f Fix out-of-map condition in buzz 2015-04-25 06:24:43 +03:00
Pasi Kallinen 1369b17e3b Stop travel or run when you get hungry 2015-04-24 16:24:50 +03:00
Pasi Kallinen aea472c0c0 Give honorifics to vampires and elves 2015-04-23 21:46:10 +03:00
Pasi Kallinen ea6157c475 Give gnomes occasionally a candle
...and if in unlit area, light the candle.
2015-04-23 21:19:25 +03:00
Pasi Kallinen 23ad7a8635 Hallucinated currencies
Originally via UnNetHack by Patric Mueller
2015-04-23 20:30:59 +03:00
Pasi Kallinen fbf787c4fe Indicate how far you fall down a hole or trapdoor
No extra message when falling down to the next level,
otherwise give "You fall down a [very] [deep] shaft!".
2015-04-23 19:27:12 +03:00
Pasi Kallinen 5a42ce4040 Unify boulder dropping on player
... and if you're swallowed, make the dropped boulder hit the monster.
(Changes from UnNetHack)
2015-04-22 20:22:55 +03:00
Pasi Kallinen ed164ad324 Fix typo in func decl 2015-04-22 13:24:51 +03:00
Pasi Kallinen 65dcf2e2cc Fold another instance of "You are rooted" into u_rooted 2015-04-22 11:54:27 +03:00
Pasi Kallinen bd69677933 Unify stumbling on door mimic 2015-04-22 09:23:54 +03:00
Pasi Kallinen 75e7d837e6 Unify food-related conducts when eating a monster 2015-04-22 09:16:49 +03:00
Pasi Kallinen 6d4aa312e6 Unify hero free hand check and msg 2015-04-22 09:02:38 +03:00
Pasi Kallinen 171e8284cd Unify monster gender setting 2015-04-22 08:58:04 +03:00
Pasi Kallinen 3bf2d17e2c Unify iron ball unwielding 2015-04-22 08:53:13 +03:00
Pasi Kallinen 34d5a4c1f9 Unify file removed -trickery 2015-04-22 08:45:03 +03:00
Pasi Kallinen 2783157f95 Unify "You are rooted" message 2015-04-22 08:35:14 +03:00
Pasi Kallinen c9bb75eaf3 Unify dropping boulder on monster 2015-04-21 22:40:27 +03: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 bac7654a75 Make sure can't chat out of the map 2015-04-20 18:09:59 +03:00
Pasi Kallinen 460538b618 Fix dark room glyphs when searching
Searching while blind showed room glyphs as lit even when
dark_room option was on.
2015-04-19 10:47:05 +03:00
Pasi Kallinen 323b7bba2c Allow wishing for polearm or hammer
which gives a random weapon with the matching skill,
so a random polearm, or a war hammer, respectively.
2015-04-18 17:25:56 +03:00
Pasi Kallinen 8c41a962a7 Fix saving xlogfile realtime 2015-04-17 10:35:05 +03:00
Pasi Kallinen 38bdb175cc Prevent divide by zero in newman
...which happened when your max power was 0
2015-04-15 21:05:46 +03:00
Pasi Kallinen 5a08671fc0 Prevent illegal positions for tmp_at
It seems like m_throw() can call tmp_at() with !isok coordinates,
so prevent those in both functions
2015-04-15 20:35:52 +03:00
Pasi Kallinen 97f6834730 Prevent infinite loop
...if the map is filled with monsters, and for some reason
the drowning just won't kill you.

Infinite looping cannot currently happen, because no-one who
can drown can keep surviving the drowning once their amulet
of life saving is used up.
2015-04-15 20:13:30 +03:00
Pasi Kallinen 35e0027328 Prevent out-of-bounds coords when closing a door 2015-04-15 19:43:53 +03:00
Pasi Kallinen e77ea2ae61 Prevent segfault when looking around inside monster
A recent change by me introduced a segfault when
counting swallowed hero as a monster inventory item.
2015-04-15 17:06:44 +03:00
Pasi Kallinen 647a072b62 Move triplicate defines into single place 2015-04-14 20:33:30 +03:00
Pasi Kallinen dc7d8eb244 YAFM for magic flute 2015-04-14 20:04:46 +03:00
Pasi Kallinen cd3b0efe5d Unify description of hero's visage into single function 2015-04-14 19:41:44 +03:00
Pasi Kallinen 9b2c298fec Sinks may be teleported or polymorphed by rings
Original patches by Leon Arnott and me.
2015-04-14 19:21:37 +03:00
Pasi Kallinen f1a5de16d9 Guard against merge segfaults
Trying to throw a quivered object resulted in a segfault, when
the code tried to merge the quivered object into itself.
2015-04-14 08:55:47 +03:00
Pasi Kallinen 31eed002c3 YAFM for dragon sitting on gold 2015-04-14 08:45:29 +03:00
Pasi Kallinen 879f6d55c2 Add Auto open doors -patch 2015-04-13 21:11:44 +03:00
Pasi Kallinen 1dd43be266 Inaccessible niches occasionally have iron bars 2015-04-13 19:55:10 +03:00
Pasi Kallinen 1c970b171e Some monsters can eat through iron bars
Any monster with rusting or corrosion attack can eat through
the bars. This includes rust monsters, grey oozes, and black puddings.

Original patch by Malcolm Ryan
2015-04-13 19:41:51 +03:00
Pasi Kallinen 6209d458f9 A camera may contain a picture-painting demon
Original patch by Leon Arnott
2015-04-13 18:54:24 +03:00
Pasi Kallinen eba5bf7d5e Add litmus test
Original patch by Dylan O'Donnell
2015-04-13 18:30:53 +03:00
Pasi Kallinen 0b0c769a05 Use our dupstr instead of strdup 2015-04-13 10:07:12 +03:00
Pasi Kallinen ee5002210f Fix gitignored 2015-04-13 08:30:47 +03:00