Commit Graph
8347 Commits
Author SHA1 Message Date
nhmall 57ff5c179d Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2018-12-27 17:37:34 -05:00
nhmall 0a2b6fb53f Merge branch 'NetHack-3.6.2' 2018-12-27 17:33:05 -05:00
nhmall ae02682cd1 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2018-12-27 17:26:56 -05:00
PatR a6b4322034 fix #H7103 - shop pricing
Player came across a stack of 2 gray stones in a shop and kicked one.
That one ended up with a different (in his case, lower) price once it
was separate.  This behavior only applies to non-glass gems which add
a price variation derived from internal ID (obj->o_id) number.  Make
splitting stacks always yield the same price per item in the new stack
as was being charged in the old stack by choosing a similar o_id.  Do
it for all splits (that can vary price by ID, so just non-glass gems),
not just ones performed inside shops.

He picked up the lower priced one and dropped it back on the original
higher priced one; the combined stack took on the lower price.  That
will no longer happen if they come from splitting a stack, but this
fix doesn't address merging with different prices when they start out
as separate stacks.  (Unpaid items won't merge in inventory if prices
are different, but shop-owned items will merge on floor.)
2018-12-27 14:12:48 -08:00
PatR f8b4ad3fdc mines luckstone as achievement marker
It was possible to have the guaranteed luckstone at Mines' End become
merged with a random one and lose its specialness for achievement
tracking.  Mark it 'nomerge' when created and clear that if/when the
achievement is recorded.
2018-12-27 13:31:42 -08:00
nhmall c6f34ccd44 Merge branch 'NetHack-3.6.2' 2018-12-26 12:20:40 -05:00
nhmall 43906fe70b Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2018-12-26 12:20:14 -05:00
PatR ceb446eaea curses lint 2018-12-26 01:45:17 -08:00
nhmall 1894832e0f Merge branch 'NetHack-3.7' 2018-12-25 22:15:02 -05:00
nhmall b616800c54 merge follow 2018-12-25 22:13:02 -05:00
nhmall 656e18786e Merge branch 'NetHack-3.6.2' 2018-12-25 22:12:44 -05:00
nhmall ed6ff9ce82 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2018-12-25 22:06:23 -05:00
Bart House 8262b6f082 Fix merge mistake. 2018-12-25 18:44:17 -08:00
Bart House 06f8450be1 Merge branch 'win-wip3.7' into win-wip3.7-bart 2018-12-25 18:35:09 -08:00
Bart House 35e6732a89 Fix compiler warning. 2018-12-25 18:34:00 -08:00
Bart House deb220c7c1 teleport and topten globals moved to instance globals. 2018-12-25 18:30:48 -08:00
Bart House ed096f74c3 shk followmsg moved to instance globals. early_init introduced. 2018-12-25 17:46:52 -08:00
Bart House cfb0e3ef78 Use MAX_LAN_USERNAME to determine if we should declare lusername. 2018-12-25 17:25:31 -08:00
Bart House c2f562e41c Define lan globals only if LAN_FEATUES is defined 2018-12-25 17:22:39 -08:00
PatR cae50298b6 container_contents() vs show goods
Fix another inconsistency with containers in shops:  prices shown when
looking inside.  Apply had them (because shop goods in containers are
flagged as 'unpaid' when hero carries the container), and loot did not
(because they aren't flagged that way).
2018-12-25 17:07:45 -08:00
PatR 96eebc1955 bill hero for magic bag explosion
Exploding a bag of holding on a shop floor didn't bill for shop-owned
contents which got destroyed.  This puts them on the 'Ix' used up list.
2018-12-25 16:52:33 -08:00
PatR 5f5f7f63f1 stolen_value() vs containers
stolen_value() treated hero-owned container holding shop-owned goods
as free for the taking.

The fix I'm working on which led to discovering this first added
stolen_value() then eventually stopped using it so I don't have an
example of where it is giving the wrong result.
2018-12-25 16:45:41 -08:00
Bart House 769ad91cc3 mthrowu, nhlan, options, regions, rip and role globals moved to g. 2018-12-25 16:26:27 -08:00
nhmall d7194709bd Merge branch 'NetHack-3.6.2' 2018-12-25 16:54:00 -05:00
nhmall 54fef9e737 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2018-12-25 16:53:40 -05:00
PatR 3aca92215c prices of items on shop floor
get_cost_of_item() was giving different information from shop #chat
when dealing with containers owned by hero containing objects owned
by the shop.  And when it was legitimately reporting a price of 0,
doname_with_price() wasn't reporting 'no charge' for items inside a
shop that were owned by hero or that shopkeeper didn't care about.

Extend the shop price reveal to far-look, but only when hero and item
being examined are inside the same shop.
2018-12-25 13:48:51 -08:00
nhmall 7974533eab Merge branch 'NetHack-3.7' into win-wip3.7 2018-12-25 16:35:45 -05:00
nhmall f52c7b0de7 merge fix-up 2018-12-25 16:34:28 -05:00
nhmall eb1f430ff5 Merge branch 'NetHack-3.6.2' 2018-12-25 16:34:07 -05:00
nhmall fcfb748876 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2018-12-25 16:26:49 -05:00
Bart House 64be5fd35a lock -> g.lock 2018-12-25 13:05:43 -08:00
PatR 99cd9ea264 simplify container_contents()
iflags.in_dumplog is accessible even when DUMPLOG is not enabled.
2018-12-25 13:05:35 -08:00
Bart House c67f7e5122 globals from files.c moved to instance globals. 2018-12-25 12:56:27 -08:00
Bart House b1ab64db43 program_state moved to g. 2018-12-25 10:09:04 -08:00
Bart House ab73df996f Fix typo lockum -> locknum 2018-12-25 09:40:30 -08:00
Bart House 16db7498d0 UNIX, VMS, DEF_PAGER, MICRO and MFLOPPY globals moved to g. 2018-12-25 09:34:24 -08:00
Bart House 0763046c38 zeroX, tc_gbl_data and fqn_prefix moved to instance globals. 2018-12-25 08:09:37 -08:00
Bart House 1c65e6afe0 context to g.context 2018-12-25 07:29:38 -08:00
Bart House 9069615861 Global changes for qt, qt4, amiga, x11 and curses. 2018-12-24 21:28:44 -08:00
Bart House 8c1a4d9a97 invent, youmonst, hackdir moved to g. 2018-12-24 21:04:15 -08:00
Bart House 90547edb83 moves, monstermoves, wailmsg, migrating_objs and billobjs moved to g. 2018-12-24 20:22:33 -08:00
Bart House be5cdcf77a killer, level and rooms move to instance globals. 2018-12-24 19:50:08 -08:00
PatR 02cfd131ee status gold vs symset:Blank
Symset:Blank sets all the map symbols (except STRANGE_OBJECT) to
<space>.  The status lines for !STATUS_HILITES force status to use '$'
instead of ' ' for the prefix before ":1234" for gold, but the status
lines for STATUS_HILITES did not.  tty ended up with ":1234" for gold.
win32 and curses both ignore the prefix and construct their own, but
since win32 uses the map symbol for that it must also be ending up
with ":1234" (I assume; I haven't seen it).  curses is forcing '$' for
the prefix, even on the rogue level.

This attempts to fix win32 without be able to test the result.  I've
left curses alone.
2018-12-24 18:43:51 -08:00
PatR 0ad8a192bf formatting: parse_conf_file() 2018-12-24 17:50:21 -08:00
Bart House 198e44216e Instance globals changes needed for X11 and gem ports. 2018-12-24 16:58:32 -08:00
Bart House 63628796c1 Instance globals changes for unix build. 2018-12-24 16:53:26 -08:00
Bart House 572ee347b9 Another round of instance globals changes. 2018-12-24 16:43:50 -08:00
Bart House e5e906dc3b Changes needed in various ports due to globals changes. 2018-12-24 14:47:51 -08:00
Bart House 62e1a45b60 Merge branch 'win-wip3.7' into win-wip3.7-bart
Conflicts:
	src/end.c
2018-12-24 12:09:42 -08:00
nhmall a229a8a56d Merge branch 'NetHack-3.6.2' 2018-12-24 06:44:27 -05:00