2 years agoUpdate the debian directory 0.16.1
gammafunk [Mon, 23 Mar 2015 03:11:58 +0000 (22:11 -0500)]
Update the debian directory

Disable LTO for now, so we can build against ubuntu trusty and support a
wider range of systems, and enable PCRE. Update the changelog for 0.16.1

2 years agoUpdate the changelog for the 0.16.1 release
gammafunk [Mon, 23 Mar 2015 02:51:30 +0000 (21:51 -0500)]
Update the changelog for the 0.16.1 release

0.16.0 users are strongly encouraged to upgrade to 0.16.1, as noted in
the changelog.

2 years agoReapply a fix for a crash with cleaving + infusion vs spectral weapons
gammafunk [Mon, 23 Mar 2015 00:00:59 +0000 (19:00 -0500)]
Reapply a fix for a crash with cleaving + infusion vs spectral weapons

This correctly applies the fix in e0bdd66d8 by using a local variable
instead of the damage_done attribute of the attack class. This reverts
commit c3c9679.

(cherry picked from commit 90bd1c500bff56e71350d45dbea52bac3bedbd97)

2 years agoDon't double all player melee damage (Revert e0bdd66d8)
reaverb [Sun, 22 Mar 2015 02:59:19 +0000 (22:59 -0400)]
Don't double all player melee damage (Revert e0bdd66d8)

This commit tried to fix a rare crash, but obviously this bug is worse.

(cherry picked from commit c3c9679156c570da4fa017b53329b233ee90c02d)

3 years agoDon't call decks of known type "BUGGY" in webtiles (#7996)
Neil Moore [Thu, 19 Mar 2015 22:24:46 +0000 (18:24 -0400)]
Don't call decks of known type "BUGGY" in webtiles (#7996)

(cherry picked from commit 2b06fc5f79593b988e632b602f416cdf02d3f1bb)

3 years agoFix spacing in a Dragoncall message
Chris Campbell [Wed, 18 Mar 2015 20:00:25 +0000 (20:00 +0000)]
Fix spacing in a Dragoncall message

(cherry picked from commit e7edae9d6cd60ce9b856e0eac007efed2030a745)

3 years agoDon't make FeWr autopickup tomahawks (#9558)
Neil Moore [Wed, 18 Mar 2015 09:15:48 +0000 (05:15 -0400)]
Don't make FeWr autopickup tomahawks (#9558)

Not putting this in autopickup_starting_ammo() because of EE stones and
Tm arrows.  The other classes that give starting ammo for non-spell
purposes are unavailable to felids (except Wn).

(cherry picked from commit a3ffbe0a4b85958bcb8526584996be3ae3382b57)

3 years agoDon't mutate or drain the player in fsim.
Neil Moore [Tue, 17 Mar 2015 22:11:55 +0000 (18:11 -0400)]
Don't mutate or drain the player in fsim.

Maybe this should hold for monsters as well?

(cherry picked from commit 8f3376a8fc35add0d4a29a3a44149e67d10257b7)

3 years agoBe more careful with duplicate ghost annotations (rast)
Neil Moore [Wed, 18 Mar 2015 06:31:26 +0000 (02:31 -0400)]
Be more careful with duplicate ghost annotations (rast)

If you had two ghosts with the same name, combo, and XL on two different
levels, the annotation tracker would treat them as one monster: seeing
one (or killing it) would remove the annotation for the other.

Now, only remove annotations for ghosts on the current level---since
they can never change levels, we don't have to worry about the same
ghost showing up twice.

There's still a problem if duplicate ghosts appear on the same level:
only one will be annotated, and killing it will remove the annotation
until the other is seen.

(cherry picked from commit a8f3a87e9d1d3449a9b5b3105a99d89a0423132f)

3 years agoDon't make Zin hate Contam (minmay)
Nicholas Feinberg [Wed, 18 Mar 2015 01:51:02 +0000 (18:51 -0700)]
Don't make Zin hate Contam (minmay)

Since it only causes nonsensical prompts when trying to attack
with a Contam weapon; Zin doesn't care if you do (& shouldn't!)

Zin still dislikes it when you de-equip a Contam weapon, of
course, but that's already pretty obviously bad... there's now a
penance warning when doing so (or when removing contam jewellery
or armour); it makes sense to me to only warn about penance when
de-equipping the item (since otherwise it would confuse players
with a 'false alarm'), but possibly it should always warn?

3 years agoDon't make monsters avoid shadow traps (simm)
Nicholas Feinberg [Tue, 17 Mar 2015 00:46:54 +0000 (17:46 -0700)]
Don't make monsters avoid shadow traps (simm)

Specifically, I_HIGH or branch-native monsters.

This function is a mess...

3 years agoFliers shouldn't think they're immune to mechtraps
Nicholas Feinberg [Tue, 17 Mar 2015 00:42:50 +0000 (17:42 -0700)]
Fliers shouldn't think they're immune to mechtraps

3 years agoDon't make monsters avoid dormant shadow traps
Nicholas Feinberg [Tue, 17 Mar 2015 00:33:22 +0000 (17:33 -0700)]
Don't make monsters avoid dormant shadow traps

3 years agoRe-add Ink Cloud's emergency flag
Nicholas Feinberg [Sun, 15 Mar 2015 23:44:17 +0000 (16:44 -0700)]
Re-add Ink Cloud's emergency flag

Accidentally removed by 9fbab266.

3 years agoDon't allow swapping with tentacles (#9549)
Chris Campbell [Sun, 15 Mar 2015 17:04:18 +0000 (17:04 +0000)]
Don't allow swapping with tentacles (#9549)

(cherry picked from commit e226842bef5af8f063386aafc4633545f22ee43d)

3 years agoDon't warn for un-ID'd stasis while hasted (9542)
Nicholas Feinberg [Sat, 14 Mar 2015 20:22:43 +0000 (13:22 -0700)]
Don't warn for un-ID'd stasis while hasted (9542)

(Or while slowed.)

Hooray for duplicate code...

3 years agoLet ctrl-f see books' last spells' schools (#9534)
Neil Moore [Sat, 14 Mar 2015 00:15:05 +0000 (20:15 -0400)]
Let ctrl-f see books' last spells' schools (#9534)

This does let books match the words "Level" and "Type", but that has
been the case for a while, anyway, since an extra newline was added.  If
we want to remove that header, we should do so in a way that is less
fragile than "skip the first two formatted_string ops".

(cherry picked from commit de53a1839f29e53f04516953afff46aff945b982)

3 years agoUnbreak other builds.
Steve Melenchuk [Fri, 13 Mar 2015 20:16:16 +0000 (14:16 -0600)]
Unbreak other builds.


(cherry picked from commit 0f27acafe92538498325a30f700e70345b4c828e)

3 years agoUgly Android build fixes.
Steve Melenchuk [Fri, 13 Mar 2015 19:31:26 +0000 (13:31 -0600)]
Ugly Android build fixes.

(cherry picked from commit e2c4c55bd7ca61f65f7dba3f13b371e1bfd98655)

3 years agoFix throwing a wielded item taking much less time.
elliptic [Fri, 13 Mar 2015 13:59:33 +0000 (09:59 -0400)]
Fix throwing a wielded item taking much less time.

3/10 as much time, in fact. This had bad effects like making it faster for
Trogites to wield spellbooks before throwing them.

(cherry picked from commit be451b3450e4e64f06634c6aa33ecdad13f626b8)

3 years agoDon't block controlled blink in Sprint
Nicholas Feinberg [Fri, 13 Mar 2015 06:11:33 +0000 (23:11 -0700)]
Don't block controlled blink in Sprint


3 years agoFinal changelog for 0.16 0.16.0
gammafunk [Thu, 12 Mar 2015 03:55:51 +0000 (22:55 -0500)]
Final changelog for 0.16

3 years agoUpdate the debian directory for 0.16.0
gammafunk [Thu, 12 Mar 2015 03:51:07 +0000 (22:51 -0500)]
Update the debian directory for 0.16.0

(cherry picked from commit b61788070244d27ec379c0ef4fa18ed31ebb5959)

3 years agoSimplify shop/shopping list interaction with duplicate stock (#8934)
Edgar A. Bering IV [Sat, 7 Mar 2015 02:00:54 +0000 (20:00 -0600)]
Simplify shop/shopping list interaction with duplicate stock (#8934)

Previously had a display bug, and didn't make sense. This still has the
wart that if a player selects to purchase one of a duplicate group the
whole group is removed from the shopping list, but it at least makes
sense over the old behavior (which was to keep the item selected, but
display nothing, and buggily accumulate nonsense total cost display).

Commiter's note: I simplified a conditional block, moved an ASSERT to a
better location, and reformatted.

(cherry picked from commit 555aecbca65a055f58a209afdc28d17532d81093)

3 years agoCheck launcher inscription before firing using the launcher (#9512)
Edgar A. Bering IV [Wed, 4 Mar 2015 02:17:23 +0000 (20:17 -0600)]
Check launcher inscription before firing using the launcher (#9512)

Commiter's note: I simplified the condition and cleaned up the

(cherry picked from commit 6943d70b85b69d2f94c6ae061cbb203f5f7c7df9)

3 years agoDon't crash when hydraform devours Asterion.
Neil Moore [Wed, 11 Mar 2015 14:28:34 +0000 (10:28 -0400)]
Don't crash when hydraform devours Asterion.

The spectral weapon was being reset on Asterion's death, but if the cleave
continued on we would check the now-vanished SW's edibility:

(cherry picked from commit 5b6732ac801ac595387b8be8ee14eba48f763b51)

3 years agoDon't generate OODs from Shadow Creatures.
Neil Moore [Wed, 11 Mar 2015 06:20:19 +0000 (02:20 -0400)]
Don't generate OODs from Shadow Creatures.

Having a small chance for a much better creature than usual provides even
more encouragement than usual to, before a planned battle, rest and recast
until the summons are especially good ones.

Even worse, it respected the OOD timer, so your shadow creatures (even
from rod of shadows) would benefit from your spending thousands of turns
on the current level.

(cherry picked from commit 328ef0e6be54797b6170557ca0eafdebf646a00f)

3 years agoDe-opacify Irradiate (CanOfWorms)
Nicholas Feinberg [Tue, 10 Mar 2015 01:30:25 +0000 (18:30 -0700)]
De-opacify Irradiate (CanOfWorms)

3 years agoDon't crash when Wyrmbaning a dragonform player (wheals)
Neil Moore [Tue, 10 Mar 2015 01:05:55 +0000 (21:05 -0400)]
Don't crash when Wyrmbaning a dragonform player (wheals)

(cherry picked from commit e12f1571bae53ed0c9dd0211b7ca1851db1c6e40)

3 years agoIrradiate tiles animation (CanOfWorms)
Nicholas Feinberg [Tue, 10 Mar 2015 01:13:50 +0000 (18:13 -0700)]
Irradiate tiles animation (CanOfWorms)

3 years agoTime out monster slow properly during torpor.
Neil Moore [Mon, 9 Mar 2015 14:48:57 +0000 (10:48 -0400)]
Time out monster slow properly during torpor.

Copied from timeout_enchantments without thinking, but here we're
decreasing the duration, not the degree.  This resulted in pre-existing
Slow ticking down out much less than usual under torpor (and not at all
if the enchantment had degree 1).

(cherry picked from commit 0c497fb7aa570c3b7f8e8ed6e45a90a812e7e7a8)

3 years agoDon't repeatedly time out monster torpor (tedric)
Neil Moore [Mon, 9 Mar 2015 13:45:26 +0000 (09:45 -0400)]
Don't repeatedly time out monster torpor (tedric)

It was timing out as usual on the slowed monster's turn, then
reactivating on the snail's turn.  Use similar logic to what already
existed in timeout_enchantments (which only applies when the player
leaves and returns to the level): if the monster is under the torpor
effect, don't slow it at all.

There still could be message spam if something breaks LOS between
the snail and the torpees.

(cherry picked from commit 9e78d70e11d573fd5bcc77bd4072399af1e48d9a)

3 years agoDon't place spectral holy swine
gammafunk [Mon, 9 Mar 2015 05:32:38 +0000 (00:32 -0500)]
Don't place spectral holy swine

Use hell hogs for now, even if they're not quite as....thematic.

(cherry picked from commit 1f86560a0eb2a41ffb2648d490986043adf2eb29)

3 years agoMake holy swine more appropriately angelic
gammafunk [Mon, 9 Mar 2015 00:31:00 +0000 (19:31 -0500)]
Make holy swine more appropriately angelic

Their description and their latest tile make it clear that these are
angelic beasts, so in keeping with this I've given them a halo and
flight, and they no longer leave a corpse.

(cherry picked from commit cb3ea14a81f23d45cebacaa246da072193ac308a)

3 years agoCreate a logfile entry when entering wizmode/exploremode.
elliptic [Sun, 8 Mar 2015 21:42:06 +0000 (17:42 -0400)]
Create a logfile entry when entering wizmode/exploremode.


This will prevent Sequell/tourney scripts from thinking that wizmode games
are perpetually in progress.

The logfile entry has ktyp=wizmode.

(cherry picked from commit f89825e838482b121855370eaae4c99bb04b1fea)

3 years agoHoly swine fix (CanOfWorms)
ontoclasm [Sun, 8 Mar 2015 22:04:17 +0000 (17:04 -0500)]
Holy swine fix (CanOfWorms)

(cherry picked from commit 7dff599e17c71b8eb4b314ace920f1b7272c5c7d)

3 years agoShard shrike tile (Bloax)
ontoclasm [Sun, 8 Mar 2015 20:29:19 +0000 (15:29 -0500)]
Shard shrike tile (Bloax)

(cherry picked from commit dd42ea2b38d98f58b26ec2279950513ba88c5c42)

3 years agoUpdate sample CAO banner in ssh_guide.txt.
Neil Moore [Sun, 8 Mar 2015 19:13:34 +0000 (15:13 -0400)]
Update sample CAO banner in ssh_guide.txt.

Mainly to update the name.

(cherry picked from commit f91d1cc2a5f556a1bb177a9d2b41ee4624afac8b)

3 years agoStill spend a turn when attempting to burn a spellbook mimic (qw).
elliptic [Sun, 8 Mar 2015 18:26:09 +0000 (14:26 -0400)]
Still spend a turn when attempting to burn a spellbook mimic (qw).

(cherry picked from commit 28bcb14a15f433edb78a6d0df8ecfe794924af65)

3 years agoAssorted Ashenzari monster equipment ID fixes.
elliptic [Sun, 8 Mar 2015 17:12:42 +0000 (13:12 -0400)]
Assorted Ashenzari monster equipment ID fixes.

Three small changes:
* Some of the messages were missing a space or had an extra space.
* Ash was giving warning messages for weapon brands even though everyone
  already gets to know those on sight nowadays.
* The chance of receiving warnings is now based on piety rather than on
  you.bondage_level, since nothing other than piety gain uses the raw value
  of you.bondage_level anyway.

(cherry picked from commit 9530971d1360c7b1c777cc28a0cdea6ea17affc9)

3 years agoHog tiles (CanOfWorms)
ontoclasm [Sun, 8 Mar 2015 07:46:37 +0000 (01:46 -0600)]
Hog tiles (CanOfWorms)

(cherry picked from commit 906d5d22d67fa4c406294524f68d9a9e51fe80c2)

3 years agoRoyal Jelly tile
ontoclasm [Sun, 8 Mar 2015 06:43:33 +0000 (00:43 -0600)]
Royal Jelly tile

(cherry picked from commit 351f9535e96f4555b5f9047abdccdce512eba0e7)

3 years agoXTAHUA tile
ontoclasm [Sun, 8 Mar 2015 03:53:25 +0000 (21:53 -0600)]

(cherry picked from commit fb27615ce2a48d0b3ca0eae9ccadf72c8f138d71)


3 years agoSupport for building a debian package from the source
gammafunk [Sun, 8 Mar 2015 03:34:05 +0000 (21:34 -0600)]
Support for building a debian package from the source

Adds a source/debian directory with updated contact info for a
devteam-released package. Distributions will likely use their own
package files; this is to help us make our own release deb files.

Only substantive change in debian/rules is to disable -g in the
CFOPTIMIZE flags for now, since I can't build the package with LTO
otherwise, even on gcc 4.9.2.

(cherry picked from commit 3d00253fe26cf2dd6ad3b2bdb704145293df07de)

3 years agoHave checkwhite ignore xpm image files
gammafunk [Sun, 8 Mar 2015 03:43:35 +0000 (21:43 -0600)]
Have checkwhite ignore xpm image files

(cherry picked from commit 429dc8a581dad4d89a7862a94036b0f50959dd1f)

3 years agoGolden dragon tile (CanOfWorms)
ontoclasm [Sun, 8 Mar 2015 03:20:11 +0000 (21:20 -0600)]
Golden dragon tile (CanOfWorms)

(cherry picked from commit 514e9a596f711f49c96a08e5a5aa00fe4855fc63)

3 years agoFix title cropping woes (#9507).
Shmuale Mark [Wed, 4 Mar 2015 20:23:06 +0000 (15:23 -0500)]
Fix title cropping woes (#9507).

(cherry picked from commit 01551211df5a9222a562157eccd335be9ccf681d)

3 years agoBennu tile (Tapsu)
ontoclasm [Sun, 8 Mar 2015 02:08:01 +0000 (20:08 -0600)]
Bennu tile (Tapsu)

(cherry picked from commit 267c4431e451156576e505a6e122db53c48ef909)

3 years agoPearl & iron dragon tiles (CanOfWorms)
ontoclasm [Sun, 8 Mar 2015 01:53:35 +0000 (19:53 -0600)]
Pearl & iron dragon tiles (CanOfWorms)

With thanks to Bloax & minmay for feedback & edits.

(cherry picked from commit 76712e3c5d3d5c059e7dfcc5b336f6b774065c5d)

3 years agoAdd missing spaces in skill help screen (ChrisOelmueller)
Neil Moore [Sat, 7 Mar 2015 15:10:47 +0000 (10:10 -0500)]
Add missing spaces in skill help screen (ChrisOelmueller)

"Enhanced skills are in blue.Manual usage is in green."

(cherry picked from commit 5b921c043313e58577273e4f103a3d01448e8107)

3 years agoDon't generate empty manuals with &%manual
Neil Moore [Sat, 7 Mar 2015 15:05:07 +0000 (10:05 -0500)]
Don't generate empty manuals with &%manual

(Likewise &o:manual<Enter><Enter>)

If you didn't specify the skill, the item would be generated as a manual
of fighting with zero skill points.  Instead, always initialise the skill
points, and explicitly make the skill Fighting rather than whatever
happens to have the value 0.

(cherry picked from commit 7da8c1fb5f7abb3e9ebab79cc19960b4353ea4d3)

3 years agoFix sdl2 submodule.
Neil Moore [Sat, 7 Mar 2015 04:31:26 +0000 (23:31 -0500)]
Fix sdl2 submodule.

(cherry picked from commit 3f54bfd6a1cc73f4bf74c004235adb5a5a644fb5)

3 years agoAdd geekosaur to CREDITS.txt
gammafunk [Sat, 7 Mar 2015 03:42:44 +0000 (21:42 -0600)]
Add geekosaur to CREDITS.txt

(cherry picked from commit 292452f499754f1d34a1b0e5d932c235b61195b6)

3 years agoUse https URLs for submodules
brandon s allbery kf8nh [Sat, 7 Mar 2015 02:41:04 +0000 (21:41 -0500)]
Use https URLs for submodules

Gitorious seems to have disabled the git: protocol, possibly to get
users to notice that it is going away in May.

Also add myself to mailmap because my last patch looked ridiculous :p

(cherry picked from commit 81c8a0a5daf4d75d4e97d5fd6bbe5c137a7b0b7c)

3 years agoLet Call Merchant work in any branch once unexplored levels have been filled up
Chris Campbell [Tue, 3 Mar 2015 23:57:55 +0000 (23:57 +0000)]
Let Call Merchant work in any branch once unexplored levels have been filled up

Previously it would place a shop at your feet, but only if you were in a branch
that would allow shops, and with no other restrictions - so in practice this
would just force you to autotravel out of Slime/Lair/wherever in order to
successfully place a shop.

(cherry picked from commit 6a50d9f2f9ef490f7edcf65c85f6f5777fa1efe6)

3 years agoAdd jvj24601 to credits.
Neil Moore [Fri, 6 Mar 2015 17:36:53 +0000 (12:36 -0500)]
Add jvj24601 to credits.

(cherry picked from commit 594cf96abfa41e01648aeba4a10380df9cab9bca)

3 years agoAdd waylon531 to credits (ebering)
Neil Moore [Fri, 6 Mar 2015 17:28:56 +0000 (12:28 -0500)]
Add waylon531 to credits (ebering)

(cherry picked from commit 2f9c35f36fb8828a09dbb05d811a1e99bb2d9fa7)

3 years agoAdd knu to credits and mailmap (ebering)
Neil Moore [Fri, 6 Mar 2015 17:26:42 +0000 (12:26 -0500)]
Add knu to credits and mailmap (ebering)

(cherry picked from commit 8b1c2ff5c0cd0e41937889d94d350e965d541899)

3 years agoFix a crash with cleaving + infusion vs spectral weapons.
Neil Moore [Fri, 6 Mar 2015 16:31:13 +0000 (11:31 -0500)]
Fix a crash with cleaving + infusion vs spectral weapons.

If we cleaved from the SW's caster (killing it) into the SW, the call
sequence melee_attack::handle_phase_hit() -> attack::calc_damage ->()
attack::player_stab() -> alert_nearby_monsters() could would cause the
SW to notice the dead caster and cease to exist.  But then we check the
vanished SW's AC for infusion damage immediately afterwards, leading
to a crash:

Instead, calculate the infusion damage first, before calling

Also, for robustness, add an extra check to prevent vampires trying to
drain already-reset monsters like these.  This check isn't currently
necessary, because _player_vampire_draws_blood happens to think that
reset monsters have no blood.

(cherry picked from commit e0bdd66d849c596fceac82094b8595117c4c4f9e)

3 years agoReduce Gyre/Gimble message spam.
elliptic [Fri, 6 Mar 2015 15:31:54 +0000 (10:31 -0500)]
Reduce Gyre/Gimble message spam.

By making it only print_wounds after the second attack. This doesn't handle
DUR_CLEAVE because there isn't any way at the moment to tell which attacks
are Gyre and which are Gimble when using DUR_CLEAVE.

(cherry picked from commit 7448f469075ec96addc3599ff0d19fd5269eed6c)

3 years agoShow sinv more correctly in xv.
Neil Moore [Thu, 5 Mar 2015 00:25:59 +0000 (19:25 -0500)]
Show sinv more correctly in xv.

The message in xv checked both the ghost struct and the M_SEE_INVIS
class flag, while in monster::can_see_invisible itself the ghost struct
overrides the flag.  Likewise xv did not check the base type for
jobbed demonspawn, so monstrous blood saints (for example) appeared
to not have see invis even though they did.

Add a monster_info method to match the can_see_invisible logic, and
check that instead.  The logic is still duplicated, but at least
now it's in a place (monster_info) where such almost-duplicate
logic feels more at home.

(cherry picked from commit c25b939f36bfd7a621fd67cf4dd5a8cbd632b293)

3 years agoDon't crash when item_slot swaps on startup.
Neil Moore [Wed, 4 Mar 2015 22:26:19 +0000 (17:26 -0500)]
Don't crash when item_slot swaps on startup.

If item_slot moved an earlier item to an already-occupied later slot,
it would leave the other item unlinked, causing a crash on the initial

Link all the items first, before applying item_slot.

(cherry picked from commit 2972493b9a1d14698de800901604d4073e35dedb)

3 years agoGive liches back their see invisible.
elliptic [Thu, 5 Mar 2015 00:06:15 +0000 (19:06 -0500)]
Give liches back their see invisible.

(cherry picked from commit c0f6fd7959ed86c3cbf046a02fc7b17479e954a7)

3 years agoBuff Gimble.
Shmuale Mark [Wed, 4 Mar 2015 19:20:36 +0000 (14:20 -0500)]
Buff Gimble.

Make it attack while confused, and do full damage.

I'm beginning to regret coopting the cleaving code...

3 years agoHide Wizardry on \ (#9517).
Shmuale Mark [Wed, 4 Mar 2015 19:08:15 +0000 (14:08 -0500)]
Hide Wizardry on \ (#9517).

(cherry picked from commit b44527389cbdaf24e3378bffe5fbddd2655e7b03)

3 years agoDon't crash when trying to put on non-jewellery.
Neil Moore [Wed, 4 Mar 2015 12:23:37 +0000 (07:23 -0500)]
Don't crash when trying to put on non-jewellery.

(cherry picked from commit 54cf826b3053c685eda4f8233de49b7d1ae23c6d)

3 years agoFix messaging when monsters abjure via casting Haunt
Chris Campbell [Wed, 4 Mar 2015 02:24:54 +0000 (02:24 +0000)]
Fix messaging when monsters abjure via casting Haunt

By handling the abjuration before printing Haunt's messaging.

(cherry picked from commit edb78a33330120e6ec9ad8bb6e4312d9741b683a)

3 years agoRemoving the macabre finger with a ring on it is no longer super fast
Edgar A. Bering IV [Tue, 3 Mar 2015 03:33:39 +0000 (21:33 -0600)]
Removing the macabre finger with a ring on it is no longer super fast

Previous code would call remove_ring which should not be called recursively,
as it adjusts you.time_taken every time it is called. Now we fail (loudly)
if a player tries to remove the necklace while it has a ring on it. This
is less elegant interface-wise, but doing the right thing otherwise would
be a larger refactor.

(cherry picked from commit b642a18a849cc69654e466430a8f05870284bbc6)

3 years agoThe macabre finger can dig in your pockets even when you can't.
Edgar A. Bering IV [Tue, 3 Mar 2015 03:20:21 +0000 (21:20 -0600)]
The macabre finger can dig in your pockets even when you can't.

This fixes 9497, probably other weird things that happened with the
macabre finger and forms that meld rings but not ammulets. Specifically:

- No longer meld a ring on the amulet when melding only rings
- Permit switching rings on the end of the amulet when in such a transform.

This is a tiny buff to the amulet's interaction with some specific forms.
I'm tempted to ammend this with some updated flavour text for the amulet
suggesting just how creepy the described behavior is.

(cherry picked from commit 6ddd7e64d630c008f1e81c07330e2de15cbca902)

3 years agoTeleport correctly breaks mesmerising and fear (9224)
Edgar A. Bering IV [Mon, 2 Mar 2015 01:13:07 +0000 (19:13 -0600)]
Teleport correctly breaks mesmerising and fear (9224)

(cherry picked from commit 6a7973eee228601cf670f89fffc7a4bee8e6d03e)

3 years agoDon't give player ghosts s2s (minmay)
Nicholas Feinberg [Wed, 4 Mar 2015 01:37:52 +0000 (17:37 -0800)]
Don't give player ghosts s2s (minmay)

Since presumably they have no sticks to transmute...

This is a brutal nerf to --tm ghosts, of course, but I think the
game will survive.

3 years agoFix necromancy miscasts tormenting LOS instead of only the miscast victim
Chris Campbell [Wed, 4 Mar 2015 00:21:07 +0000 (00:21 +0000)]
Fix necromancy miscasts tormenting LOS instead of only the miscast victim

Broken by 8a05d2b9773c8.

(cherry picked from commit 400abd6f4b6b813bcd8d8f06a061ab01632bbac8)

3 years agoDon't try to curse holy wrath weapons with Scythe of Curses.
elliptic [Tue, 3 Mar 2015 23:54:00 +0000 (18:54 -0500)]
Don't try to curse holy wrath weapons with Scythe of Curses.

This caused really annoying message spam, because the weapon would never
actually become cursed so the scythe would keep trying to curse it over and

(cherry picked from commit fcb2a4caf10b46731d186084a61b3d16b4e89a31)

3 years agoDon't allow reading magic mapping for no effect in the Abyss (#9514)
Chris Campbell [Tue, 3 Mar 2015 16:56:44 +0000 (16:56 +0000)]
Don't allow reading magic mapping for no effect in the Abyss (#9514)

(cherry picked from commit b793c6dfb68a057a9811f9824b549f2dd9a52d4d)

3 years agoFix messaging when branding unidentified weapons (#9515)
Chris Campbell [Tue, 3 Mar 2015 16:56:21 +0000 (16:56 +0000)]
Fix messaging when branding unidentified weapons (#9515)

(cherry picked from commit b2cac18637da3c22dee241060b64e080f2566421)

3 years agoLet shafts work on flying monsters, remove save based on body weight
Chris Campbell [Tue, 3 Mar 2015 15:53:46 +0000 (15:53 +0000)]
Let shafts work on flying monsters, remove save based on body weight

Since shafts now work on flying players, allow shafts (as well as the shafting
effects from the stone of tremors and the Shaft card) to work on flying
monsters too. Change the weight-based save to a fixed 1/4 chance to escape for
regular dungeon shafts (the same as the current chance for a human to escape).

(cherry picked from commit 8b1fb446bf6ea29fdd2dc52bfed12850422fc898)

3 years agoChangelog through 0.16-a0-4134-g2ca243f 0.16-b1
Nicholas Feinberg [Tue, 3 Mar 2015 02:29:03 +0000 (18:29 -0800)]
Changelog through 0.16-a0-4134-g2ca243f

3 years agoLet Ashenzari's skill boost handle unrandart staves
Chris Campbell [Tue, 3 Mar 2015 01:53:20 +0000 (01:53 +0000)]
Let Ashenzari's skill boost handle unrandart staves

Instead of just boosting staves skill when wielding unrandart staves, treat
them like regular magical staves (boosting both evocations and staves for
those with a melee effect such as the Elemental Staff, evocations only for
staves with an evokable ability such as the staff of Wucad Mu, etc).

3 years agoMerge branch 'zotdef_removal'
Chris Campbell [Mon, 2 Mar 2015 22:27:32 +0000 (22:27 +0000)]
Merge branch 'zotdef_removal'

3 years agoMention Bend Time on ^ when worshipping Chei (Tuxi[Qyou])
Chris Campbell [Mon, 2 Mar 2015 22:25:29 +0000 (22:25 +0000)]
Mention Bend Time on ^ when worshipping Chei (Tuxi[Qyou])

And display a message when gaining Chei's slowed metabolism.

3 years agoUpdate some hints mode messages
Chris Campbell [Sun, 1 Mar 2015 23:06:00 +0000 (23:06 +0000)]
Update some hints mode messages

3 years agoUpdate some tutorial messages
Chris Campbell [Sun, 1 Mar 2015 20:02:48 +0000 (20:02 +0000)]
Update some tutorial messages

3 years agoMake catoblepas speed 10 and reduce their breath spam a bit (minmay)
gammafunk [Mon, 2 Mar 2015 03:39:38 +0000 (21:39 -0600)]
Make catoblepas speed 10 and reduce their breath spam a bit (minmay)

Them having both low-damage breath and slow action means they were very
easy to escape. They're now speed 10, and their breath weighting has
been reduced so that they'll use it about 20% less often than they did
at speed 8, since it was too frequent even then.

3 years agoSimplify (wheals)
Neil Moore [Mon, 2 Mar 2015 00:38:38 +0000 (19:38 -0500)]
Simplify (wheals)

3 years agoDon't include (inert) in the action table for xp evokers (9486)
Edgar A. Bering IV [Mon, 2 Mar 2015 00:31:10 +0000 (18:31 -0600)]
Don't include (inert) in the action table for xp evokers (9486)

3 years agoBe a little more careful.
Neil Moore [Mon, 2 Mar 2015 00:20:40 +0000 (19:20 -0500)]
Be a little more careful.

I didn't mean to replace all those checks, just the base_type part.

3 years agoStop vampire feeding when a corpse skeletonises.
Neil Moore [Mon, 2 Mar 2015 00:00:26 +0000 (19:00 -0500)]
Stop vampire feeding when a corpse skeletonises.

See for example:

And improve a related message.

3 years agoFix debug mode compilation (oops)
Neil Moore [Sun, 1 Mar 2015 22:58:03 +0000 (17:58 -0500)]
Fix debug mode compilation (oops)

Introduced by my "improvement" in 0.16-a0-4120-gb205902.

3 years agoRemove unique annotations for god gifts and pacification (dpeg, #9475)
Edgar A. Bering IV [Sun, 1 Mar 2015 21:56:12 +0000 (15:56 -0600)]
Remove unique annotations for god gifts and pacification (dpeg, #9475)

If you convert Saint Roka his annotation follows you around even though
he's an ally. Additionally, prior to this patch, a annotation was only
removed for a pacified unique if the player saw the unique leave. This
has been changed to remove the annotation on pacification.

This has a possible edge case that I don't think can actually happen. If
the unique is pacified and then becomes hostile again before leaving out
of the player's sight the annotation won't be re-added, which could lead
to a player being surprised. If this can happen (maybe with clouds?)
it's far less frequent than an annotation remaining because the player
did not see the monster leave.

[Committer's note: removed a set of braces. -nfm]

3 years agoDon't use typedef with anonymous structs (minmay)
Neil Moore [Sun, 1 Mar 2015 22:08:32 +0000 (17:08 -0500)]
Don't use typedef with anonymous structs (minmay)

This isn't C.

3 years agoPrevent infinite recursion via frenzied twins (#9137)
Zannick [Sat, 31 Jan 2015 21:58:07 +0000 (13:58 -0800)]
Prevent infinite recursion via frenzied twins (#9137)

- Don't attempt to make a frenzied twin hostile since it won't work.
- Don't convert one twin if the other dies insane.
- Refactor some common twin-finding code into a separate function.
- Hold off on upgrading them until after they come out of it. Duvessa
  won't be able to berserk while insane or exhausted anyways, and Dowan
  can't really cast while insane, so this mostly affects when Dowan's
  spell set changes and the message printed.
- A twin that comes out of frenzy reverts to the same attitude as their
  twin (or hostile if that twin is still frenzied or dead). This, I think,
  makes the most sense, since the only sources of frenzy are: the monster
  spell (which neither has), the AoE player spell, and the needle. And,
  let's face it, if both get frenzied by a monster using needles, it's
  probably the player's fault.
- Add "frenzied and insane" to monsters' debug descriptions.

[Committer's note: Lifted a comma_separated_line call out of both sides
 of an if; and fixed braces. -nfm]

3 years agoAmbrosia no longer heals more when performing fast actions (#9504)
Edgar A. Bering IV [Fri, 27 Feb 2015 16:58:09 +0000 (10:58 -0600)]
Ambrosia no longer heals more when performing fast actions (#9504)

3 years agoDon't suppress textinput events for AltGr on Windows (#9306)
Neil Moore [Sun, 1 Mar 2015 20:41:30 +0000 (15:41 -0500)]
Don't suppress textinput events for AltGr on Windows (#9306)

Ignore the keydown events entirely.  Thanks to Lasty for helping find the
right combination of modifiers to look for.

3 years agoDon't put an extra newline after wrapcprintf.
Neil Moore [Sun, 1 Mar 2015 20:06:06 +0000 (15:06 -0500)]
Don't put an extra newline after wrapcprintf.

This put the cursor in the wrong place when editing a pre-filled
input line (modifying an inscription, for example).

Introduced in 0.16-a0-4058-ga3e9557, oops.

3 years agoExtend auto-pickup behavior to inert evokables (minmay)
Corin Buchanan-Howland [Sun, 1 Mar 2015 19:21:58 +0000 (14:21 -0500)]
Extend auto-pickup behavior to inert evokables (minmay)

3 years agoMake ARTP_CURSED less recursive.
Neil Moore [Sun, 1 Mar 2015 03:38:14 +0000 (22:38 -0500)]
Make ARTP_CURSED less recursive.

3 years agoUpdate test/stress/qw.rc.
elliptic [Sun, 1 Mar 2015 00:12:55 +0000 (19:12 -0500)]
Update test/stress/qw.rc.

With many fixes and improvements. The main home for qw.rc is, and just two changes have been made to it
for inclusion here: AUTO_START = true and clear_messages = false.

3 years agoBone dragon tile (CanOfWorms)
ontoclasm [Fri, 27 Feb 2015 19:52:33 +0000 (13:52 -0600)]
Bone dragon tile (CanOfWorms)

3 years agoGelatinous tiles (CanOfWorms)
ontoclasm [Thu, 26 Feb 2015 05:56:53 +0000 (23:56 -0600)]
Gelatinous tiles (CanOfWorms)

3 years agoDon't butt-lify "fly" (PleasingFungus)
Neil Moore [Thu, 26 Feb 2015 04:34:05 +0000 (23:34 -0500)]
Don't butt-lify "fly" (PleasingFungus)