crawl.git
6 years agoUpdate SDL contrib to 1.2.15 plus an OS X fix (#9069).
Steve Melenchuk [Fri, 7 Nov 2014 00:02:52 +0000]
Update SDL contrib to 1.2.15 plus an OS X fix (#9069).

See the contrib for details.

6 years agoFix WebTiles compilation on OS X
gammafunk [Thu, 6 Nov 2014 23:36:31 +0000]
Fix WebTiles compilation on OS X

6 years agoCats like fish.
Kyle Fox [Thu, 6 Nov 2014 23:27:29 +0000]
Cats like fish.

6 years agoTag two vaults with no_exits (travis-ci).
Shmuale Mark [Thu, 6 Nov 2014 23:34:20 +0000]
Tag two vaults with no_exits (travis-ci).

Looks like the other ones in the series can't be totally surrounded
by trees, though.

6 years agoClarify.
Shmuale Mark [Thu, 6 Nov 2014 23:12:17 +0000]
Clarify.

6 years agoUnbrace.
Shmuale Mark [Thu, 6 Nov 2014 23:04:59 +0000]
Unbrace.

6 years agoMindexicide: fun with tentacles!
Shmuale Mark [Thu, 6 Nov 2014 21:04:18 +0000]
Mindexicide: fun with tentacles!

6 years agoClean up some Torment code.
Shmuale Mark [Thu, 6 Nov 2014 19:20:18 +0000]
Clean up some Torment code.

6 years agoMindexicide: ouch(), scorefile_entry.
Shmuale Mark [Thu, 6 Nov 2014 18:49:41 +0000]
Mindexicide: ouch(), scorefile_entry.

6 years agoDon't mimic zigs (9147)
Brendan Hickey [Thu, 6 Nov 2014 13:31:50 +0000]
Don't mimic zigs (9147)

6 years agoDon't call the player "the La Petite Mort" (PleasingFungus).
Shmuale Mark [Thu, 6 Nov 2014 13:20:23 +0000]
Don't call the player "the La Petite Mort" (PleasingFungus).

6 years agoSimplify.
Shmuale Mark [Thu, 6 Nov 2014 13:00:09 +0000]
Simplify.

6 years agoRevert c++11
Nicholas Feinberg [Thu, 6 Nov 2014 04:09:12 +0000]
Revert c++11

Temporarily, until OS X builds can be got working again.

6 years agoTidy
Nicholas Feinberg [Thu, 6 Nov 2014 04:00:16 +0000]
Tidy

6 years agoImplement skill-specific titling for Kiku and Nemelex (9144)
Brandon Kime [Wed, 5 Nov 2014 23:44:32 +0000]
Implement skill-specific titling for Kiku and Nemelex (9144)

This patch changes the title displayed for having highest skill in Necromancy
and Evocations with Kiku and Nemelex, respectively. Since those gods use those
skills for their abilities it seems appropriate. Additionally, it is a nice way
for some of the titles on the huge list of unused ones to get some light.

This overrides the normal highest skill titles for Necromancy/Evocations
(respectively), but not the easter egg one for Spriggans.

(committer's note: adjusted commit message.)

6 years agoRemove switch/case forever (itemname)
Nicholas Feinberg [Thu, 6 Nov 2014 03:42:53 +0000]
Remove switch/case forever (itemname)

6 years agoTry to use GCC 4.8 for Travis.
Steve Melenchuk [Thu, 6 Nov 2014 03:26:08 +0000]
Try to use GCC 4.8 for Travis.

Inspired by this: https://github.com/travis-ci/travis-ci/issues/1379

This should let it do C++11 properly.

6 years agoAppease gcc 4.6
Brendan Hickey [Thu, 6 Nov 2014 03:03:14 +0000]
Appease gcc 4.6

"ship it" -- wheals

6 years agoDon't display books as staves
Nicholas Feinberg [Thu, 6 Nov 2014 02:32:32 +0000]
Don't display books as staves

6 years agoPotentially Fix Failing Build
Brendan Hickey [Thu, 6 Nov 2014 02:48:49 +0000]
Potentially Fix Failing Build

6 years agoC++11 (grunt)
Brendan Hickey [Thu, 6 Nov 2014 02:25:15 +0000]
C++11 (grunt)

Compile with --std=c++11. This breaks crawl on  ancient compilers.
We should document the earliest supported version of each compiler
we care about.

6 years agoFix random item tiles (9144)
Nicholas Feinberg [Thu, 6 Nov 2014 01:54:18 +0000]
Fix random item tiles (9144)

Need to unify these more tightly; books especially have some
real witchcraft going on.

6 years agohrm, shouldn't this be the default?
Jesse Luehrs [Thu, 6 Nov 2014 00:03:09 +0000]
hrm, shouldn't this be the default?

6 years agoClean up a function (|amethyst).
Shmuale Mark [Wed, 5 Nov 2014 23:58:22 +0000]
Clean up a function (|amethyst).

<+|amethyst> hm, a do...while(0) solely so that you can use break
             instead of goto
<+|amethyst> clever

6 years agoFix a typo
Chris Oelmueller [Wed, 5 Nov 2014 18:55:49 +0000]
Fix a typo

6 years agoDon't crash when a monster dies during casting a spell, either.
Shmuale Mark [Wed, 5 Nov 2014 23:15:38 +0000]
Don't crash when a monster dies during casting a spell, either.

6 years agoMore Insulting
Brendan Hickey [Wed, 5 Nov 2014 23:16:00 +0000]
More Insulting

Get thee hence reprobate!

6 years agoUnbrace.
Neil Moore [Wed, 5 Nov 2014 23:08:57 +0000]
Unbrace.

6 years agoDon't crash when casting IOOD at an adjacent foe.
Neil Moore [Wed, 5 Nov 2014 23:01:58 +0000]
Don't crash when casting IOOD at an adjacent foe.

If the IOOD exploded as part of its first move, our attempts to
make the dead monster lose extra energy caused a crash.

Also remove a check that papered over the bug by making the energy
loss "work", changing it to an assert instead.

6 years agoFix ugly thing move energy.
Shmuale Mark [Wed, 5 Nov 2014 22:47:16 +0000]
Fix ugly thing move energy.

6 years agoFixup unitialised move_energys better.
Shmuale Mark [Wed, 5 Nov 2014 22:40:32 +0000]
Fixup unitialised move_energys better.

Since there's no guarantee that they would be 0.

Also corrects naga ghost move speed.

6 years agoDon't dereference non-monster evildoers.
Zannick [Wed, 5 Nov 2014 21:23:43 +0000]
Don't dereference non-monster evildoers.

6 years agoalso fix up ghost_demons loaded from save files
Jesse Luehrs [Wed, 5 Nov 2014 18:57:02 +0000]
also fix up ghost_demons loaded from save files

6 years agoinitialize move_energy for non-ghost ghost_demons (wheals)
Jesse Luehrs [Wed, 5 Nov 2014 18:53:15 +0000]
initialize move_energy for non-ghost ghost_demons (wheals)

should fix xv crashing on ugly things and such

6 years agotry to fix crash when monsters cast iood (PleasingFungus)
Jesse Luehrs [Wed, 5 Nov 2014 18:47:18 +0000]
try to fix crash when monsters cast iood (PleasingFungus)

6 years agoalways install gdb, to get better crash logs
Jesse Luehrs [Wed, 5 Nov 2014 17:26:07 +0000]
always install gdb, to get better crash logs

6 years agoactually use the function i wrote
Jesse Luehrs [Wed, 5 Nov 2014 16:37:02 +0000]
actually use the function i wrote

6 years agoDon't crash on Glaciate versus a hydra.
Shmuale Mark [Wed, 5 Nov 2014 16:06:25 +0000]
Don't crash on Glaciate versus a hydra.

Or saltifying one, just in case.

6 years agotry a different way to display crash reports on error
Jesse Luehrs [Wed, 5 Nov 2014 16:05:45 +0000]
try a different way to display crash reports on error

6 years agoAnother buggy item name fix (9136)
Nicholas Feinberg [Wed, 5 Nov 2014 16:01:36 +0000]
Another buggy item name fix (9136)

6 years agodisable the submodule builds for now
Jesse Luehrs [Wed, 5 Nov 2014 15:50:19 +0000]
disable the submodule builds for now

6 years agoCombine the interface for splashing players/monsters with acid.
Shmuale Mark [Wed, 5 Nov 2014 15:47:03 +0000]
Combine the interface for splashing players/monsters with acid.

6 years agoRemove unused attack variables
Nicholas Feinberg [Wed, 5 Nov 2014 06:13:05 +0000]
Remove unused attack variables

6 years agoAllow small_more to work with clear_messages
Chris Oelmueller [Sat, 12 Oct 2013 19:00:24 +0000]
Allow small_more to work with clear_messages

Previously, combining both options caused the small_more setting to be
disabled regardless of player settings.

Fixes 0002296

6 years agoMake player speed only affect ghost movement speed, not action speed.
Shmuale Mark [Wed, 5 Nov 2014 15:08:27 +0000]
Make player speed only affect ghost movement speed, not action speed.

6 years agoDescriptions of Searing/Chilling breath.
Shmuale Mark [Wed, 5 Nov 2014 14:32:01 +0000]
Descriptions of Searing/Chilling breath.

6 years agoMelt Condensation Shield on block, not hit (#1648).
Shmuale Mark [Wed, 5 Nov 2014 14:27:41 +0000]
Melt Condensation Shield on block, not hit (#1648).

6 years agoCorrode a monster/player when they block an acid attack (PleasingFungus).
Shmuale Mark [Wed, 5 Nov 2014 14:13:38 +0000]
Corrode a monster/player when they block an acid attack (PleasingFungus).

6 years agoPunctuate Ru milestone and sacrifice messages. (nonethousand)
Corin Buchanan-Howland [Wed, 5 Nov 2014 12:12:43 +0000]
Punctuate Ru milestone and sacrifice messages. (nonethousand)

6 years agoand another
Jesse Luehrs [Wed, 5 Nov 2014 06:36:40 +0000]
and another

6 years agoAdd (curse) after artefacts in %, too (#2977)
Neil Moore [Wed, 5 Nov 2014 06:27:52 +0000]
Add (curse) after artefacts in %, too (#2977)

This one is a bit more of a hack: the annotation is added in a different
method (name() rather than name_aux()) so that it can come after the
artefact property inscriptions :(

6 years agoUse (cursed) suffix for jewellery in %.
Neil Moore [Wed, 5 Nov 2014 06:08:18 +0000]
Use (cursed) suffix for jewellery in %.

And in terse mode in general, to match weapons and armour.

6 years agoanother missing dep
Jesse Luehrs [Wed, 5 Nov 2014 06:22:13 +0000]
another missing dep

6 years agofix dependency installation
Jesse Luehrs [Wed, 5 Nov 2014 06:05:27 +0000]
fix dependency installation

6 years agostill need alsa even for BUILD_ALL
Jesse Luehrs [Wed, 5 Nov 2014 05:53:34 +0000]
still need alsa even for BUILD_ALL

6 years agofix tests for dechunk
Jesse Luehrs [Wed, 5 Nov 2014 05:51:27 +0000]
fix tests for dechunk

6 years agoMake cursed jewellery itemspecs work (#5938)
Neil Moore [Wed, 5 Nov 2014 05:50:11 +0000]
Make cursed jewellery itemspecs work (#5938)

And document that 'damaged' does nothing for jewellery.  Now 'cursed'
always curses the item if possible (but not holy wrath items).

6 years agoDon't crash when rerolling a bad randart.
Neil Moore [Wed, 5 Nov 2014 05:25:04 +0000]
Don't crash when rerolling a bad randart.

We were resetting its quantity.  You could see this most easily with:
    0200&%any weapon randart ego:holy_wrath

6 years agosigh
Jesse Luehrs [Wed, 5 Nov 2014 05:24:55 +0000]
sigh

6 years agohandle errors properly in travis build runner
Jesse Luehrs [Wed, 5 Nov 2014 05:06:59 +0000]
handle errors properly in travis build runner

6 years agocut down the number of builds a bit
Jesse Luehrs [Wed, 5 Nov 2014 04:57:07 +0000]
cut down the number of builds a bit

6 years agodon't run qw tests by default
Jesse Luehrs [Wed, 5 Nov 2014 04:54:30 +0000]
don't run qw tests by default

they are flaky

6 years agoMore Insults
Brendan Hickey [Wed, 5 Nov 2014 04:49:06 +0000]
More Insults

...and the horse you rode in on.

6 years agoDon't spawn chaos champions with old weapons
Nicholas Feinberg [Wed, 5 Nov 2014 04:41:35 +0000]
Don't spawn chaos champions with old weapons

Or whips or clubs; unfortunate casualties of implementation
details.

6 years agoAdd a few randart weapon name components
Nicholas Feinberg [Wed, 5 Nov 2014 04:29:24 +0000]
Add a few randart weapon name components

6 years agoDon't hit an inifinte loop when casting IMB.
Shmuale Mark [Tue, 4 Nov 2014 23:37:38 +0000]
Don't hit an inifinte loop when casting IMB.

6 years agoAllow monsters besides Donald to talk in all branches.
Shmuale Mark [Tue, 4 Nov 2014 22:54:15 +0000]
Allow monsters besides Donald to talk in all branches.

<|amethyst> wheals:  dungeon, swamp, shoals, crypt, vaults, hell,
dis, zot, abyss, depths, and many portal vaults would work.

Other branches could not have monsters speaking based on their monster
type (though other key matches could work) ever since Donald's branch-
specific speech was added, in eb2694d6.

6 years agoReplace some magic constants.
Neil Moore [Tue, 4 Nov 2014 21:49:44 +0000]
Replace some magic constants.

But books use constants here that differ from NDSC_*, so leave those.

6 years agoCorrect bad sign conversion from unmarshalling (#9131)
Neil Moore [Tue, 4 Nov 2014 21:42:54 +0000]
Correct bad sign conversion from unmarshalling (#9131)

We originally used unmarshallByte to unmarshall into a uint8_t, which
is incorrect but happens to work.  Then item_description was changed
to an array of uint32_t, so the conversion from int8_t sign-extended
before converting to unsigned.  Then later we store these values in
item_def::subtype_rnd, which is signed, and they become negative numbers
that cause problems for wand_secondary_string and friends.

Unmarshall that byte correctly, and fix up old saves that may have
been affected.  This doesn't do anything about the fact that we convert
from unsigned to signed in item_colour.

6 years agoDon't give draconian player illusions two breath attacks.
Shmuale Mark [Tue, 4 Nov 2014 21:34:19 +0000]
Don't give draconian player illusions two breath attacks.

6 years agoMake ghosts not a ' ' (#9132).
Shmuale Mark [Tue, 4 Nov 2014 21:24:56 +0000]
Make ghosts not a ' ' (#9132).

As tempting as it is to ape NetHack...

6 years agoDon't base behavior on beam names.
Shmuale Mark [Tue, 4 Nov 2014 21:06:50 +0000]
Don't base behavior on beam names.

...with exceptions still existing for one of the Upheaval effects,
and several draconian breaths. Not sure how to resolve them without
adding even more SPELL_ enums.

6 years agoRemove the '-plain' command-line option.
Shmuale Mark [Tue, 4 Nov 2014 18:50:05 +0000]
Remove the '-plain' command-line option.

It was the same as adding 'char_set = ascii' to your rcfile (we always
encode in UTF-8 no matter what).

6 years agoMake an assertion more verbose.
Neil Moore [Tue, 4 Nov 2014 21:10:13 +0000]
Make an assertion more verbose.

6 years agodon't skip_join, it requires annoying configuration
Jesse Luehrs [Tue, 4 Nov 2014 21:10:23 +0000]
don't skip_join, it requires annoying configuration

6 years agodon't fail if there are no files
Jesse Luehrs [Sun, 17 Aug 2014 18:51:16 +0000]
don't fail if there are no files

6 years agoHide a hack better.
Shmuale Mark [Tue, 4 Nov 2014 18:37:35 +0000]
Hide a hack better.

I'm not convinced this hack is necessary at all, despite what a comment
in monster::body_weight claims; there doesn't seem to be anything
with CE_NOCORPSE that has a corpse, and it isn't referenced at all in
the blood potion/biting code.

6 years agoAdd Bloax's obsidian statue tile.
Shmuale Mark [Tue, 4 Nov 2014 18:18:51 +0000]
Add Bloax's obsidian statue tile.

6 years agotemporarily fix buggy item descriptions (PleasingFungus)
Jesse Luehrs [Tue, 4 Nov 2014 18:42:13 +0000]
temporarily fix buggy item descriptions (PleasingFungus)

6 years agoSimplify (|amethyst)
Nicholas Feinberg [Tue, 4 Nov 2014 16:17:35 +0000]
Simplify (|amethyst)

6 years agoFix (?) a type warning, maybe
Nicholas Feinberg [Tue, 4 Nov 2014 16:01:09 +0000]
Fix (?) a type warning, maybe

6 years agoFix save compat (9126)
Nicholas Feinberg [Tue, 4 Nov 2014 15:40:25 +0000]
Fix save compat (9126)

Don't turn all weapons into holy wrath weapons on save compat.

Also, change the ring plus threshold to 6, since +8 slayrings are
no more.

6 years agoDebuggify books (9127)
Nicholas Feinberg [Tue, 4 Nov 2014 15:28:43 +0000]
Debuggify books (9127)

6 years agoappearance -> subtype_rnd
Nicholas Feinberg [Tue, 4 Nov 2014 06:46:36 +0000]
appearance -> subtype_rnd

For clarity.

And make books not use it, since they don't get named/coloured
consistently anyway. (They... may have been broken before this?
name-wise)

6 years agoRemove consum_desc
Nicholas Feinberg [Tue, 4 Nov 2014 03:10:17 +0000]
Remove consum_desc

There's no reason for potions & scrolls to use plus to store
appearance when everything else uses 'appearance'. (Also, there's
no reason for scrolls to use two fields, since it all gets mashed
into one int anyway.)

6 years agoAdd a few monsters to mons_is_native_in_branch
Nicholas Feinberg [Tue, 4 Nov 2014 05:45:48 +0000]
Add a few monsters to mons_is_native_in_branch

And give klowns weight, now that they don't need to be weightless
to avoid traps.

6 years agoFix some misleading score system comments (johnstein).
elliptic [Tue, 4 Nov 2014 05:11:47 +0000]
Fix some misleading score system comments (johnstein).

6 years agoWhen possible, do a lookup for monster colour instead of storing it
gammafunk [Tue, 28 Oct 2014 04:28:23 +0000]
When possible, do a lookup for monster colour instead of storing it

Previously a monster's colour was stored in its instance upon
creation, and most monsters had their colour copied from the glyph
table. Storing monster colour is still necessary for certain monsters
like ugly things, ballistomycetes, and vault-define monsters with
custom colours. For monsters with a default color, we now look up
colour in the glyph table. The benefit is that player overrides to
colour via the mon_glyph option take effect immediately and effect
even monsters already generated, in addition to the removal of most
monster colour state.

Player overrides to monsters with colours that are randomized or
otherwise set outside of mon-data.h, including butterflies, pan lords,
and player ghosts, will also work now. Currently player overrides
effect even vault-defined monster colours, and we may change the logic
with respect to such monsters in the future.

This commit introduces the COLOUR_INHERIT value to indicate that the
monster uses its default colour, as well as COLOUR_UNDEF, which has
the same value as BLACK. Now COLOUR_UNDEF is used instead of BLACK to
indicate an undefined colour to be set later in monster
initialization/placement. Monsters that previously cycled colour with
each action (killer klowns, spatial vortices, and some pandemonium
lords) now use ETC_RANDOM instead.

6 years agoAdd obsidian statues to the changelog
Nicholas Feinberg [Tue, 4 Nov 2014 05:04:51 +0000]
Add obsidian statues to the changelog

6 years agoChangelog through 0.16-a0-1857-g6c74090
Nicholas Feinberg [Tue, 4 Nov 2014 04:45:03 +0000]
Changelog through 0.16-a0-1857-g6c74090

6 years agoRemove a bad comment
Nicholas Feinberg [Tue, 4 Nov 2014 02:13:40 +0000]
Remove a bad comment

doesn't make sense to try to preserve monster colour on chunks
anyway, now that they're slurrified.

6 years agoRemove a pointless comment and indent.
Corin Buchanan-Howland [Tue, 4 Nov 2014 03:55:54 +0000]
Remove a pointless comment and indent.

6 years agoFix repeating previous command after using a macro.
Corin Buchanan-Howland [Tue, 4 Nov 2014 03:50:15 +0000]
Fix repeating previous command after using a macro.

This may well have unexpected consequences, but no one seems sure.
Elliptic says qw still works, so hopefully this still works with complex
macros.

6 years agoDe-insectify shrikes a little more.
Corin Buchanan-Howland [Tue, 4 Nov 2014 03:49:07 +0000]
De-insectify shrikes a little more.

6 years agoMake caustic shrikes scarier and rarer
Corin Buchanan-Howland [Tue, 4 Nov 2014 03:39:34 +0000]
Make caustic shrikes scarier and rarer

This removes them from all dungeon spawning, and also removes them
from non-OOD Depths spawning. They are now the scary OODs you get in
Depths. Band size is reduced too.

6 years agoSwitch a few insect traits to bird traits on shrikes.
Corin Buchanan-Howland [Tue, 4 Nov 2014 03:26:28 +0000]
Switch a few insect traits to bird traits on shrikes.

6 years agoRename caustic bees to caustic shrikes and make them birds.
Corin Buchanan-Howland [Tue, 4 Nov 2014 03:17:32 +0000]
Rename caustic bees to caustic shrikes and make them birds.

6 years agoConjure Flame for monsters.
Steve Melenchuk [Tue, 4 Nov 2014 02:48:56 +0000]
Conjure Flame for monsters.

They try to block your lines of retreat into hallways with it.

This time around, it's a ghost exclusive, but I can think of a few
enemies needing new spellsets that might benefit from this.

6 years agoAdd a very bad tile for obsidian statues.
Shmuale Mark [Tue, 4 Nov 2014 02:11:51 +0000]
Add a very bad tile for obsidian statues.

6 years agoRename silver statues -> obsidian statues (theTower, PleasingFungus).
Shmuale Mark [Tue, 4 Nov 2014 02:04:46 +0000]
Rename silver statues -> obsidian statues (theTower, PleasingFungus).

Silver implies a connection with Zin that does not exist. Obsidian,
on the other hand, is already connected to demon summoning (see
the obsidian axe).