crawl.git
6 years agoMerge branch 'panlord-colour'
Steve Melenchuk [Sun, 30 Nov 2014 05:56:06 +0000]
Merge branch 'panlord-colour'

6 years agoMore Ru refactoring
Nicholas Feinberg [Sun, 30 Nov 2014 04:36:16 +0000]
More Ru refactoring

Export a key & simplify _ru_expire_sacrifices().

6 years agoMove sacrifice special cases into data
Nicholas Feinberg [Sun, 30 Nov 2014 04:29:21 +0000]
Move sacrifice special cases into data

6 years agoSimplify Ru sacrifice choice code further
Nicholas Feinberg [Sun, 30 Nov 2014 04:19:45 +0000]
Simplify Ru sacrifice choice code further

6 years agoPartially refactor _get_possible_sacrifices()
Nicholas Feinberg [Sun, 30 Nov 2014 03:24:48 +0000]
Partially refactor _get_possible_sacrifices()

6 years agoReplace NULL with nullptr
reaverb [Sun, 30 Nov 2014 01:00:31 +0000]
Replace NULL with nullptr

6 years agoReformat some Sabbath.
Neil Moore [Sun, 30 Nov 2014 02:59:08 +0000]
Reformat some Sabbath.

6 years agoMisc. panlord appearance tweaks panlord-colour
ontoclasm [Sun, 30 Nov 2014 01:48:46 +0000]
Misc. panlord appearance tweaks

6 years agoAdd a file that makes shift-move safe move instead of run (_miek).
Shmuale Mark [Sun, 30 Nov 2014 01:35:01 +0000]
Add a file that makes shift-move safe move instead of run (_miek).

6 years agoAdd CMD_SAFE_MOVE_<direction> and CMD_SAFE_WAIT.
Mark Lodato [Mon, 28 Jan 2013 05:52:17 +0000]
Add CMD_SAFE_MOVE_<direction> and CMD_SAFE_WAIT.

These commands move the player in <direction> or wait a turn, but only
if there is no monster around, equivalent to running one tile or
resting one turn.

This commit does not bind these commands to any keys by default.

6 years agoCheckwhite.
Shmuale Mark [Sun, 30 Nov 2014 00:50:54 +0000]
Checkwhite.

6 years agoMoved C++ layouts to their own file
infiniplex [Mon, 27 Oct 2014 00:06:12 +0000]
Moved C++ layouts to their own file

6 years agoRemoved redundant commands to set layout types
infiniplex [Mon, 27 Oct 2014 00:05:17 +0000]
Removed redundant commands to set layout types

6 years agoSwap ophan and seraph halo sizes.
Shmuale Mark [Sun, 30 Nov 2014 00:44:54 +0000]
Swap ophan and seraph halo sizes.

6 years agoTurn the bools in duration-data.h into a bitfield
reaverb [Fri, 14 Nov 2014 01:12:37 +0000]
Turn the bools in duration-data.h into a bitfield

6 years agoRefactor _arcane_mutation_to_skill()
Nicholas Feinberg [Sun, 30 Nov 2014 00:08:24 +0000]
Refactor _arcane_mutation_to_skill()

Goes from O(1) to O(n), but could be trivially cached if anyone
cares, which they shouldn't.

6 years agoFix a sacrifice message
Nicholas Feinberg [Sat, 29 Nov 2014 23:45:48 +0000]
Fix a sacrifice message

Ru asks you to Ru asks you to sacrifice all use of:

6 years agoGut _arcane_mutation_to_school_name()
Nicholas Feinberg [Sat, 29 Nov 2014 23:44:54 +0000]
Gut _arcane_mutation_to_school_name()

6 years agoSimplify (Grunt)
Nicholas Feinberg [Sat, 29 Nov 2014 22:41:44 +0000]
Simplify (Grunt)

6 years agoMake _potion_effect not use potion types
Edgar A. Bering IV [Fri, 28 Nov 2014 22:32:16 +0000]
Make _potion_effect not use potion types

But, instead, miscast_potion_types. (potion_like_effects...?)

Since they're not really using the potions anyway, and we'd like
to be able to change/remove potions without having to touch miscast
code!

6 years agoWarn before Irradiating pals (Davzz)
Nicholas Feinberg [Sat, 29 Nov 2014 22:08:18 +0000]
Warn before Irradiating pals (Davzz)

6 years agoAdd Cigotuvi's Badtile
Nicholas Feinberg [Sat, 29 Nov 2014 21:53:26 +0000]
Add Cigotuvi's Badtile

6 years agoImprove randlich spell tweak (fishbowltower)
Nicholas Feinberg [Sat, 29 Nov 2014 21:34:07 +0000]
Improve randlich spell tweak (fishbowltower)

6 years agoTemporarily remove randlich chain lightning
Nicholas Feinberg [Sat, 29 Nov 2014 21:29:27 +0000]
Temporarily remove randlich chain lightning

Excessively murderous.

It will return in a slightly less murderous form, in future.

6 years agoIrradiate quote (9265)
Nicholas Feinberg [Sat, 29 Nov 2014 21:14:40 +0000]
Irradiate quote (9265)

6 years agoSimplify (r)eading books (9274)
Nicholas Feinberg [Sat, 29 Nov 2014 21:09:40 +0000]
Simplify (r)eading books (9274)

Now exactly the same as examining them through the inventory.

Also, weirdness fixed.

6 years agochangelog
Jesse Luehrs [Sat, 29 Nov 2014 15:12:37 +0000]
changelog

6 years agoScattered minor monster tweaks.
theTower [Sat, 29 Nov 2014 07:06:02 +0000]
Scattered minor monster tweaks.

 * Remove poisonous bites from two spiders that already have distinct
   non-poisonous offense, jumping and orb. The former gets a slight
   damage boost to the bite to compensate (not that the poison was
   previously seen very often anyway, since 5 damage won't get to
   trigger poison against nearly any ac), the latter gets nothing since
   it takes discord or frenzy to even see them bite.
 * Give Mnoleg more exciting attack verbs, since he is juxtaposed
   with klowns now and they get such exciting attack verbs themselves.
   The only influencing aspect of this is that one attack counts as
   a claw for hydras.
 * Give Dissolution 4 more HD, so his poly isn't sad (for now) and
   so that he has a better chance to actually hit extended evasion
   without needing eyeball paralysis.
 * Block Killer Klowns from polymorph / shapeshifters; they're extremely
   weird to get from such, and the top hd area for the either of those
   already got the highly-dangerous birds without needing klowns too.

6 years agoPanlord description fixes/changes
ontoclasm [Sat, 29 Nov 2014 06:50:55 +0000]
Panlord description fixes/changes

6 years agoPanlord wing edits
ontoclasm [Sat, 29 Nov 2014 06:50:34 +0000]
Panlord wing edits

6 years agoFix compilation (doh)
Neil Moore [Sat, 29 Nov 2014 06:00:31 +0000]
Fix compilation (doh)

6 years agoDon't count natural abilities as spells for monster berserk checks.
Steve Melenchuk [Sat, 29 Nov 2014 05:49:28 +0000]
Don't count natural abilities as spells for monster berserk checks.

Should get moths of wrath to berserk draconians, dragons, etc. again.

6 years agoImprove(?) the message for entering a malign portal.
Neil Moore [Sat, 29 Nov 2014 05:12:17 +0000]
Improve(?) the message for entering a malign portal.

6 years agoImprove a kaux.
Neil Moore [Sat, 29 Nov 2014 05:08:50 +0000]
Improve a kaux.

The message needs to be improved, too: 2d4 damage is hardly significant
enough to be called "untold damage".

6 years agoDon't let trees enter malign portals.
Neil Moore [Sat, 29 Nov 2014 04:48:32 +0000]
Don't let trees enter malign portals.

They would take the damage but stay in their old location with the
message "You feel a strange sense of stasis."

6 years agoOnly damage an actor in collision if it's not dead already (78291).
Steve Melenchuk [Sat, 29 Nov 2014 05:02:09 +0000]
Only damage an actor in collision if it's not dead already (78291).

Killing the other can trigger explosions, etc. which can kill the actor
before it calls the next hurt() line.

6 years agoDon't slam into the ! (78291).
Steve Melenchuk [Sat, 29 Nov 2014 03:43:53 +0000]
Don't slam into the ! (78291).

6 years agoSimplify? De-indent, anyway.
Steve Melenchuk [Sat, 29 Nov 2014 03:40:15 +0000]
Simplify? De-indent, anyway.

6 years agoWake up monsters with Singularity pull or collisions (78291).
Steve Melenchuk [Sat, 29 Nov 2014 03:39:16 +0000]
Wake up monsters with Singularity pull or collisions (78291).

6 years agoRoughly sort mon-pick-data.h entries
theTower [Sat, 29 Nov 2014 02:57:21 +0000]
Roughly sort mon-pick-data.h entries

The lists are roughly sorted by two methods. Either the branch's scaling
is unimportant or barely present, in which case the monster entries are
sorted by rough holiness / concept categories and vague strength, or the
branch scaling is obvious and relevant, which thus implies sorting by a
sucession of minimum depth, maximum depth, weight, and weighting type.

It's still not necessarily very visible in the latter case what the average
floor's population is like, but it should be a little easier to see what
the branch's overall progression is like as well direct comparsion points
for other monsters. For the former case, it makes it easier to assess what's
present in that area by virtue of the groupings.

(A handful of lines with redundant FLAT ranges were trimmed, too.)

Nothing should change, content-wise, from this. I hope.

6 years agoNew Seraph tile.
Steve Melenchuk [Fri, 28 Nov 2014 22:51:18 +0000]
New Seraph tile.

Pieced together from Denzi's old TSO avatar tile and some of the other
current holy tiles, with some cues taken from Denzi's previous seraph
tile.

32x48. Beware.

Thanks to ontoclasm for helping me polish this up.

6 years agoShow weapons and shields properly on more holies.
Steve Melenchuk [Fri, 28 Nov 2014 22:15:51 +0000]
Show weapons and shields properly on more holies.

This involves some edits to the daeva tile to remove the weapon and
shield that were already there.

6 years agoRemove a stray debugging include.
Steve Melenchuk [Fri, 28 Nov 2014 21:44:45 +0000]
Remove a stray debugging include.

GGGRRRUUUNNNTTT

6 years agoLine up panlord descriptions with tiles.
Steve Melenchuk [Fri, 28 Nov 2014 21:42:30 +0000]
Line up panlord descriptions with tiles.

We're losing a lot of descriptions in the process here, but there's a
hunger to make new panlord tiles anyway, so we can bring those back once
we have tiles for them.

6 years agoAdjust Makhleb's ^ screen for piety changes
reaverb [Tue, 25 Nov 2014 00:58:12 +0000]
Adjust Makhleb's ^ screen for piety changes

6 years agoIncrease Makhleb piety to compensate for no corpse sacrifices
reaverb [Thu, 20 Nov 2014 05:17:24 +0000]
Increase Makhleb piety to compensate for no corpse sacrifices

Specifically, increase it for MH_NATURAL monsters (which is highly
correlated with dropping a corpse). The piety for those monsters is 4/3
what it used to be.

This is an estimate, anybody else should feel free to tweak this if they
feel Makhleb piety is off.

6 years agoRemove Makhleb corpse sacrifices
reaverb [Thu, 13 Nov 2014 20:44:29 +0000]
Remove Makhleb corpse sacrifices

Since I failed to say this when I remove Okawaru sacrifices, I'll
describe here why corpse sacrifices are being targeted:

In general, corpse sacrifices have a huge interface burden. Players need
to go over every single corpse generated in the game they do not a
specific use for and press “p”. This is so bad there is an automation
option - a clear sign that a system isn’t producing enough decisions.

This would be possibly acceptable if there was a massive benefit to
keeping corpse sacrifices, but in this case there isn’t. For most
characters, there are some corpse which should obviously be sacrificed
(those the character can’t eat or animate), some amount of corpses which
clearly need to be eaten/butchered for hides, and a very tiny amount of
corpses which make the player seriously consider the cost/benefit
analysis of eating the corpse versus sacrificing it to their god.

Corpse sacrifices do cause some minor distinction between species which
need to eat different amounts of corpses, but this is an extremely small
benefit when compared to the massive downsides of corpse sacrifices. (In
addition there are other ways species interact different with the gods,
most notably different Invocations aptitudes).

6 years agoVault stone tiles (Bloax)
ontoclasm [Fri, 28 Nov 2014 21:30:57 +0000]
Vault stone tiles (Bloax)

6 years agoMake shining gold always visually distinct from normal gold (simm).
Steve Melenchuk [Fri, 28 Nov 2014 20:42:49 +0000]
Make shining gold always visually distinct from normal gold (simm).

6 years agoDon't display asterisks for Gozag.
Steve Melenchuk [Fri, 28 Nov 2014 20:39:48 +0000]
Don't display asterisks for Gozag.

Gozag has no piety.

6 years agoFix Agony, etc. enchantment power modifiers (#9273).
Steve Melenchuk [Fri, 28 Nov 2014 20:35:52 +0000]
Fix Agony, etc. enchantment power modifiers (#9273).

Overloading this field is abominably stupid; it needs to at least be a
union if not a completely separate field.

6 years agoMake Gozag-distracting gold itself shine as opposed to show an aura.
Steve Melenchuk [Fri, 28 Nov 2014 20:33:40 +0000]
Make Gozag-distracting gold itself shine as opposed to show an aura.

That is, the tiles surrounding it don't glow; only the gold itself does.

Should be less visually spammy.

TODO: make the gold aura icons sparkly; actually remove the aura (which
is presently used only to make sure the aura shows up in tiles).

6 years agoOnly apply the CURSE OF GOZAG to items new to the player.
Steve Melenchuk [Fri, 28 Nov 2014 19:56:46 +0000]
Only apply the CURSE OF GOZAG to items new to the player.

This disallows scumming the wrath by dropping and picking up rations,
etc.

6 years agoAbort Corona cast if only targets are glowing/shadowed (ChrisOelmueller).
Steve Melenchuk [Fri, 28 Nov 2014 19:30:35 +0000]
Abort Corona cast if only targets are glowing/shadowed (ChrisOelmueller).

That is, properly consider them unenchantable for the purpose of z as
opposed to Z.

6 years agoMake Zin hate drinking !benemut even if you don't mutate (#9271)
reaverb [Fri, 28 Nov 2014 18:17:36 +0000]
Make Zin hate drinking !benemut even if you don't mutate (#9271)

6 years agoShush some compiler warnings.
Shmuale Mark [Fri, 28 Nov 2014 17:48:45 +0000]
Shush some compiler warnings.

6 years agoBuild with -Wunused-parameter.
Shmuale Mark [Fri, 28 Nov 2014 17:48:30 +0000]
Build with -Wunused-parameter.

6 years agoFixup "Fixup fixup of fixup_spells.".
Shmuale Mark [Fri, 28 Nov 2014 17:46:42 +0000]
Fixup "Fixup fixup of fixup_spells.".

6 years agoFixup fixup of fixup_spells.
Steve Melenchuk [Fri, 28 Nov 2014 17:09:00 +0000]
Fixup fixup of fixup_spells.

GGGRRRUUUNNNTTT

6 years agoFixup fixup_spells; make crashforged servitors spellforged again.
Steve Melenchuk [Fri, 28 Nov 2014 16:39:27 +0000]
Fixup fixup_spells; make crashforged servitors spellforged again.

freq wasn't get set heading into normalize_spell_freq, which seems to
have assumed that it had non-zero frequencies to work with there. It now
has an ASSERT to stop that from happening and crashing messily.

6 years agoRemove 6-year-old commented code
Nicholas Feinberg [Fri, 28 Nov 2014 04:54:03 +0000]
Remove 6-year-old commented code

For heaven's sake.

6 years agoAdd a piety meter for Xom
Edgar A. Bering IV [Thu, 30 Oct 2014 05:44:14 +0000]
Add a piety meter for Xom

Position based on current mood; coloured if interest dips to (or
near) BORING levels.)

6 years agofix my name in the credits
Edgar A. Bering IV [Thu, 27 Nov 2014 18:56:54 +0000]
fix my name in the credits

6 years agoSpell-item description simplification
Nicholas Feinberg [Thu, 27 Nov 2014 18:36:59 +0000]
Spell-item description simplification

Deduplicate the listing (which previously occurred in several
different places), add future support for interactive monster
spell listings, make the game exit the inventory screen when
you destroy a book for amnesia (as it does when memorizing a
spell), and remove a 14-year-old piece of code that
constructed a null-terminated string by hand for no reason.

6 years agoConsistently use one ray for singularity pulling.
Steve Melenchuk [Thu, 27 Nov 2014 19:49:28 +0000]
Consistently use one ray for singularity pulling.

6 years agoGive Singularity to random panlords.
Steve Melenchuk [Thu, 27 Nov 2014 19:39:14 +0000]
Give Singularity to random panlords.

As well as Fulminant Prism, to see how it operates.

Muhahahahahahaha.

6 years agoBrace.
Nicholas Feinberg [Thu, 27 Nov 2014 18:39:35 +0000]
Brace.

6 years agoCall down the wrath of NO GOD against DEAD VARIABLE (PleasingFungus).
Steve Melenchuk [Thu, 27 Nov 2014 18:18:45 +0000]
Call down the wrath of NO GOD against DEAD VARIABLE (PleasingFungus).

6 years agoSave compat for randliches.
Steve Melenchuk [Thu, 27 Nov 2014 18:07:52 +0000]
Save compat for randliches.

I'm not 100% sure this loads the old spells properly, but that may not
be relevant.

6 years agoChange dependence of Singularity radius / strength on power.
Steve Melenchuk [Thu, 27 Nov 2014 18:01:45 +0000]
Change dependence of Singularity radius / strength on power.

Strength now falls off with range^2, not 4 + range. This reduces the
range at high power considerably and increases the strength at low power
considerably, both of which have been identified as issues.

6 years agoShow strength=2 radius in singularity targeter as well.
Steve Melenchuk [Thu, 27 Nov 2014 17:50:05 +0000]
Show strength=2 radius in singularity targeter as well.

So you can get an idea of how the power varies with radius.

6 years agoMove singularity acting code before IOOD check.
Steve Melenchuk [Thu, 27 Nov 2014 17:46:49 +0000]
Move singularity acting code before IOOD check.

So that it can use M_PROJECTILE while still being able to act properly.

6 years agofix loading randart ring mails in dump files (#9148)
Jesse Luehrs [Thu, 27 Nov 2014 17:38:11 +0000]
fix loading randart ring mails in dump files (#9148)

6 years agoDisallow harming or moving singularities in any way.
Steve Melenchuk [Thu, 27 Nov 2014 17:32:57 +0000]
Disallow harming or moving singularities in any way.

6 years agoBuff collision damage.
Steve Melenchuk [Thu, 27 Nov 2014 17:28:03 +0000]
Buff collision damage.

Since it's affected by AC now.

6 years agoFix Chilling Breath crashes.
Steve Melenchuk [Thu, 27 Nov 2014 17:26:57 +0000]
Fix Chilling Breath crashes.

Turns out the ray could advance into the wall and not get reset properly
afterwards; this now only keeps the ray advance if the position is
viable for that.

6 years agoSet killer properly for death curses (wheals).
Steve Melenchuk [Thu, 27 Nov 2014 17:12:00 +0000]
Set killer properly for death curses (wheals).

No more killer= and ckiller=something.

6 years ago+ instead of ^M for explore mode explore
Jesse Luehrs [Thu, 27 Nov 2014 16:54:00 +0000]
+ instead of ^M for explore mode

6 years agoallow felids to die normally in explore mode
Jesse Luehrs [Thu, 27 Nov 2014 16:14:01 +0000]
allow felids to die normally in explore mode

6 years agosave explore mode state
Jesse Luehrs [Thu, 27 Nov 2014 15:47:25 +0000]
save explore mode state

6 years agoMerge branch 'master' into explore
Jesse Luehrs [Thu, 27 Nov 2014 15:01:21 +0000]
Merge branch 'master' into explore

6 years agosimplify
Jesse Luehrs [Thu, 27 Nov 2014 14:53:23 +0000]
simplify

6 years agomake sure that all liches get at least one conj spell
Jesse Luehrs [Thu, 27 Nov 2014 14:34:31 +0000]
make sure that all liches get at least one conj spell

6 years agoMerge branch 'master' into randliches
Jesse Luehrs [Thu, 27 Nov 2014 13:33:57 +0000]
Merge branch 'master' into randliches

Conflicts:
crawl-ref/source/mon-util.cc

6 years agoPanlord body & head edits
ontoclasm [Thu, 27 Nov 2014 06:49:59 +0000]
Panlord body & head edits

6 years agoInsert the letter 'c'
Nicholas Feinberg [Thu, 27 Nov 2014 05:21:16 +0000]
Insert the letter 'c'

6 years agoFix quote formatting and citations.
Neil Moore [Thu, 27 Nov 2014 05:11:47 +0000]
Fix quote formatting and citations.

6 years agoFurther remove player twisted res.
Neil Moore [Thu, 27 Nov 2014 02:45:13 +0000]
Further remove player twisted res.

Mark the spell as SPFLAG_MONSTER, and remove the cast_* function.

6 years agoMess with battlesphere quotes (9267)
Nicholas Feinberg [Thu, 27 Nov 2014 04:58:46 +0000]
Mess with battlesphere quotes (9267)

6 years agoShatter/LRD quotes (ramc, 9267)
Nicholas Feinberg [Thu, 27 Nov 2014 04:51:37 +0000]
Shatter/LRD quotes (ramc, 9267)

6 years agoSprinkle around some shrikes (and other quick vault population tweaks)
theTower [Thu, 27 Nov 2014 00:49:01 +0000]
Sprinkle around some shrikes (and other quick vault population tweaks)

Mostly additions to Cocytus and Zot, though both caustics and shards
have lone visitations in a miniscule slice of some Depths vaults.
Also, caustics replace some lair end vault representatives for Lair
zigs, shard shrikes slip into Ice zigs, and orc zigs don't place excess
orcs anymore (since it doesn't really add to the threat and gets in the
way of placing marginally more dangerous stuff in later zigs).

6 years agoA few Xom lines.
David Ploog [Wed, 26 Nov 2014 22:47:19 +0000]
A few Xom lines.

6 years agoModify pandlord color schemes
ontoclasm [Wed, 26 Nov 2014 22:42:44 +0000]
Modify pandlord color schemes

6 years agoAdd a 1/8 chance for Plane Papyrus in wizlab_golubria.
Neil Moore [Wed, 26 Nov 2014 21:41:57 +0000]
Add a 1/8 chance for Plane Papyrus in wizlab_golubria.

6 years agoBlack pixels on monster damage indicator now slightly semi-transparent.
John McCartney [Wed, 26 Nov 2014 20:43:02 +0000]
Black pixels on monster damage indicator now slightly semi-transparent.

6 years agoRemoved rim from wretched stars in dc-mon.
John McCartney [Wed, 26 Nov 2014 20:39:35 +0000]
Removed rim from wretched stars in dc-mon.

6 years agoFurther iterations to goblinoids; better visibility for wretched stars.
John McCartney [Wed, 26 Nov 2014 20:08:54 +0000]
Further iterations to goblinoids; better visibility for wretched stars.

6 years agoAllow scrolling stack-five card descriptions (#9262)
Neil Moore [Wed, 26 Nov 2014 21:00:28 +0000]
Allow scrolling stack-five card descriptions (#9262)

Also insert empty lines between them, now that we aren't so pressed
for space.

6 years agoAvoid another pacification crash.
Neil Moore [Wed, 26 Nov 2014 20:37:00 +0000]
Avoid another pacification crash.

When reentering a level that had a confused pacified monsted on stairs:
  http://dobrazupa.org/morgue/Farquar/crash-Farquar-20141126-194317.txt

We should really just avoid removing the monster in handle_behaviour and
do that on the monster's next turn.  Similar crash fixes for pacified
monsters include 5b05a17, d65c940, and 48bc299, and those are just the
ones I committed myself.

6 years agoAdjust a default runrest_ignore
Nicholas Feinberg [Wed, 26 Nov 2014 15:23:00 +0000]
Adjust a default runrest_ignore

Nothing special about the last point of corpse armour.