summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/ouch.cc
Commit message (Collapse)AuthorAgeFilesLines
...
* Drop obsolete CVS last-committed headers ($Author$).Adam Borowski2009-10-061-2/+0
|
* Amulet of guardian spirit, it comes as an amulet or a cap.Adam Borowski2009-10-051-0/+11
| | | | | | | | When worn, all non-poison damage will drain mana instead, hurting hp only after mana is depleted. The cap brand is intended only for a fixedart, but per dpeg's request, it will be generated on ordinary caps for now, as a test.
* Make miasma and miasma resistance more consistent. It no longer dependsDavid Lawrence Ramsey2009-09-291-1/+1
| | | | on negative energy resistance, but on rotting resistance.
* Apply zebez' patch to differentiate gates some more from stairs.j-p-e-g2009-07-251-1/+2
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10403 c06c8d41-db1a-0410-9941-cceddc491573
* Use ETC_MAGIC for beam animations with unknown effect, so we don't j-p-e-g2009-07-201-2/+2
| | | | | | | | accidentally leak information about unID'd wands etc. Some additional space fixes. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10358 c06c8d41-db1a-0410-9941-cceddc491573
* Simplify the royal jelly effect for both players and monsters, and make dolorous2009-07-191-6/+1
| | | | | | | sure that both spawn Jiyva-worshipping jellies. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10311 c06c8d41-db1a-0410-9941-cceddc491573
* Add still more minor fixes.dolorous2009-07-191-6/+6
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10299 c06c8d41-db1a-0410-9941-cceddc491573
* Apply vonbrand's patch in [2823698] to fix compilation under g++ 4.4.0.dolorous2009-07-181-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10281 c06c8d41-db1a-0410-9941-cceddc491573
* Add the Slime god as per n78291's (Shayne?) patch. Thanks! :Dj-p-e-g2009-07-181-0/+66
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10271 c06c8d41-db1a-0410-9941-cceddc491573
* First part of the merger of fixed artefacts into unrandom artefactszelgadis2009-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (further changes will be much smaller). Breaks savefile compatibility, and bumps the major savefile version up to 6. Some changes made to some tiles files, but it hasn't been tested with a tiles build. Overview of changes: * Unrand artefacts are now defined in art-data.txt and is turned into C code via util/art-data.pl. This has the dual advantage of being more readable by humans, and that if the unrand data structure changes then you can just change util/art-data.pl and regenerate the C code rather than having to change some 70 different C structs by hand. * util/art-data.pl automatically updates NO_UNRANDARTS, and also automatically generates an enumeration of all the unrands which are equal to their item.special field. * randart.cc and randart.h have been renamed to artefact.cc and artefact.h, since the files covers all types of artefacts, and the differences between randarts, unrandarts and (former) fixed arts have been minimized since the terms were introduced. Also renamed unrand.h to art-data.h * The brands and resistances of former fixed arts are now handled via artefact properties, but the rest of their special behaviours are still hardcoded. * Unrandarts are now distinguished between normal and "special", with the special ones currently just being identical to the list of the formed fixed arts. Special unrandarts are randomly generated less often than normal unrandarts, can be generated in the Abyss if they've been lost, can't be picked up by monsters, and can't be affected by Tukima's Dance. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10035 c06c8d41-db1a-0410-9941-cceddc491573
* * Tweak Xom's ideas about what makes a funny or boring death.j-p-e-g2009-04-221-0/+3
| | | | | | | | | * Add another option (*sigh*) covering whether W=T and P=R. (Defaults to false.) * Various spacing and comment fixes. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9675 c06c8d41-db1a-0410-9941-cceddc491573
* * Fix Xom's piety wrapping around from 0 -> 255.j-p-e-g2009-04-181-1/+0
| | | | | | | | | | | | | | | | * Fix Xom piety 100 (initial state) favouring bad effects. * Limit tension bonus for good effects to 199. * Add penalty for tension 0, so bad effects become more likely without tension. * Revert order of Xom's amusement to actually match the amusement gain. (Was getting "roars with laughter" for gain of 2, etc.) * Add damage shaving to Deep Dwarf ghosts. * Add 'o' to pickup list commands -> stop prompting, start autoexplore. * Default menu_colour_item_class to true in initfile.cc. * Allow autopickup of chunks in Lich form. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9634 c06c8d41-db1a-0410-9941-cceddc491573
* Xom again:j-p-e-g2009-03-281-3/+1
| | | | | | | | | | * tweak values for tension and amusement * Xom only laughs about "funny" deaths * gift_timeout rerolling after a bad act depends on its severity * replace the blink effect with position swapping git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9561 c06c8d41-db1a-0410-9941-cceddc491573
* Only display Xom's death message for Xom worshippers.dolorous2009-03-201-2/+2
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9521 c06c8d41-db1a-0410-9941-cceddc491573
* Add a few more Xom messages. Also, since he already has a mass dolorous2009-03-201-2/+2
| | | | | | | | confusion effect, replace Mass Confusion with Cause Fear in his random spell list. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9520 c06c8d41-db1a-0410-9941-cceddc491573
* * For flavour, let Xom laugh himself silly whenever a follower dies.j-p-e-g2009-03-191-11/+22
| | | | | | | | | | | | * Fix Xom being amused about rotten corpses being butchered. (As opposed to clean corpses becoming rotten while butchered, which is how it was originally intended.) * Xom no longer is amused if you deliberately hit yourself with a missile/wand/spell in safe surroundings. (Identifying wands that way or zapping /random effects is still considered amusing.) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9519 c06c8d41-db1a-0410-9941-cceddc491573
* * Change Roxanne's spells to include Blink Other (instead of Sandblast) j-p-e-g2009-03-191-1/+1
| | | | | | | | | | as spell to fall back on if all others are out of range. (Fixes 2686559.) * Fix 2690141: Tiles inventory leaking cursedness of items. * Fix 2687108: inappropriate message flushing during repeat command. * Fix opening/closing doors not updating exclusion los. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9516 c06c8d41-db1a-0410-9941-cceddc491573
* * Fix 2687930: Shorten the spell menu more, and don't call update_title() j-p-e-g2009-03-161-1/+1
| | | | | | | | at '?' as apparently all it does is hide the first spell line. * Uncomment the autoinscription of weapons of distortion in init.txt. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9511 c06c8d41-db1a-0410-9941-cceddc491573
* Add minor cosmetic fixes.dolorous2009-03-101-2/+2
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9407 c06c8d41-db1a-0410-9941-cceddc491573
* Add more spacing fixes.dolorous2009-02-261-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9231 c06c8d41-db1a-0410-9941-cceddc491573
* Add Deep Dwarves patch, with some minor changes.haranp2009-02-231-1/+13
| | | | | | | | | | | | | | | | Add a new mutation, MUT_SLOW_HEALING, which at level 3 blocks all healing; it can't be acquired randomly, but deep dwarves start with it at level 3. This overrides regeneration, including the god-given kind (Trog's Hand.) Fix mutation listings (hopefully I got this right.) There are still some cases where DD HP shaving is not applied: ability HP costs, Staff of Dispater effect, vampiric draining backlash, Sublimation of Blood spell. Fix dancing weapons leaving mgrd incorrect if their weapon can't be generated. Breaks saves. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9173 c06c8d41-db1a-0410-9941-cceddc491573
* If death from stat loss is escaped via wizard mode then reset the stat to max,zelgadis2009-01-221-4/+26
| | | | | | | and don't reset HP to max HP. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8683 c06c8d41-db1a-0410-9941-cceddc491573
* Rename cleansing flame resistance to holy energy resistance, and clean dolorous2009-01-191-4/+4
| | | | | | | up holy wrath weapon checks. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8595 c06c8d41-db1a-0410-9941-cceddc491573
* Consolidate the player and monster draining functions in fight.cc, make dolorous2009-01-181-4/+11
| | | | | | | | | monster draining take multiple levels of negative energy resistance into account, and only set the necromancy conduct if draining actually took place, as with draining beams. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8551 c06c8d41-db1a-0410-9941-cceddc491573
* Generalize the check for unchivalric attacks via cleansing flame.dolorous2009-01-181-4/+7
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8527 c06c8d41-db1a-0410-9941-cceddc491573
* Tweaks to make it less likely that command repitition will be cancled when it'szelgadis2009-01-181-1/+5
| | | | | | | being used to wizard test Xom acts. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8525 c06c8d41-db1a-0410-9941-cceddc491573
* Move cleansing flame (BEAM_HOLY) resistance to the actor interface.dolorous2009-01-181-4/+5
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8523 c06c8d41-db1a-0410-9941-cceddc491573
* Consolidate checks for the player's being undead or a demonspawn into dolorous2009-01-181-2/+1
| | | | | | | player_is_unholy(), a la mons_is_unholy(), and use it where possible. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8522 c06c8d41-db1a-0410-9941-cceddc491573
* Fix inverted logic.dolorous2009-01-181-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8521 c06c8d41-db1a-0410-9941-cceddc491573
* Properly generalize the target in the "space warps crazily" dolorous2009-01-101-1/+1
| | | | | | | translocation miscast. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8389 c06c8d41-db1a-0410-9941-cceddc491573
* Some code cleanup, inspired by [2483180].haranp2009-01-081-62/+35
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8324 c06c8d41-db1a-0410-9941-cceddc491573
* Adding REVISION() macro to all source files.ennewalker2009-01-041-0/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8217 c06c8d41-db1a-0410-9941-cceddc491573
* Don't let the player starve to death while observing the arena.zelgadis2009-01-011-0/+2
| | | | | | | ouch() asserts if called while in arena mode. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8077 c06c8d41-db1a-0410-9941-cceddc491573
* Improved handling of Xom accidentally killing the player.zelgadis2008-12-211-3/+9
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7900 c06c8d41-db1a-0410-9941-cceddc491573
* Implement reliable protection from harm for Elyvilon (available under dolorous2008-12-211-3/+13
| | | | | | | prayer at high enough piety, but with a significant piety cost). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7898 c06c8d41-db1a-0410-9941-cceddc491573
* FR #2011386:zelgadis2008-12-151-6/+17
| | | | | | | | | | | When giving or deleting a random mutation you can now request that the mutation picked doesn't instantly kill the player. Xom code now uses this option, except for when the player is under penance from Xom or Xom is bored. Improvements to the code that prevents Xom from accidently killing the player. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7835 c06c8d41-db1a-0410-9941-cceddc491573
* Partial implementation of FR #2011386: Xom shouldn't directly kill the playerzelgadis2008-12-141-0/+16
| | | | | | | | | | | | | | | | unless he's being nasty (the player is under penance from Xom or Xom is bored). I've put checks into _xom_is_good() and _xom_is_bad() to avoid this as much as possible, and as a safety-net changed ouch() to return early if the player dies from a Xom effect when Xom wasn't being nasty so that xom_acts() can then fix things up (this causes Xom to give a message from "Xom accidental homicide" in dat/database/godspeak.txt) Next up will be an addition to mutate() so you can request random mutations be non-lethal, which should take care of all known situations where ouch() returns early due to Xom making a mistake. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7833 c06c8d41-db1a-0410-9941-cceddc491573
* Harpies now also eat food on the ground.j-p-e-g2008-12-031-31/+39
| | | | | | | | Add a description (as suggested by David) and two quotes. Since harpies will eat anything they are now resistant to poison. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7737 c06c8d41-db1a-0410-9941-cceddc491573
* Implement harpyes. They ...j-p-e-g2008-12-031-36/+43
| | | | | | | | | | | | | * appear in bands of 2-5 * use bat like movement * may steal (= destroy) the player's food. Still needs a tile. Also, actually use the M_BATTY flag instead of hardcoding batty monsters. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7734 c06c8d41-db1a-0410-9941-cceddc491573
* Added shields of reflection, though they're not randomly generated and have nozelgadis2008-12-011-1/+3
| | | | | | | | | | | | | | | | valuation is shopping.cc. It currently only reflects missiles that are blocked with the shield. They could also reflect the brand effects of blocked melee weapons, but I'm not sure if that's a good idea. drop_item and the item to be dropped have been moved from fire_beam()'s parameters into the bolt structure, along with the beam's remaining range. Seems to work fine, but it might still lead to some buggyness. The game now distinguishes between killing yourself by hitting yourself with a beam bounced off a wall versus other forms of self targeting. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7705 c06c8d41-db1a-0410-9941-cceddc491573
* Allow ziggurats placed in Pandemonium to return to the same Pan level when ↵dshaligram2008-11-251-12/+10
| | | | | | | | | | | | | | the player leaves the ziggurat. Breaks saves. Cleaned up up_stairs() and down_stairs() to remove spurious depth changes when changing you.level_type - depth (you.your_level) now changes only for stairs with both ends in LEVEL_DUNGEON. All levels are now saved on exit, including non LEVEL_DUNGEON levels. Re-entering non-dungeon levels from down_stairs will still delete the old level. Re-entering non-dungeon levels from up_stairs (i.e. returning to a non-dungeon level from some other place, like a ziggurat) will reload the old level. Fixed bogus marker trashing when player attempts to use a Zot entrance with insufficient runes. Delete .msg files when game ends. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7598 c06c8d41-db1a-0410-9941-cceddc491573
* Add miscellaneous minor fixes.dolorous2008-11-181-2/+2
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7476 c06c8d41-db1a-0410-9941-cceddc491573
* Add more player duration cleanups, and fix ouch() napalm death sources.dolorous2008-11-121-2/+5
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7439 c06c8d41-db1a-0410-9941-cceddc491573
* Consolidate the routines to remove the player's condensation shield into dolorous2008-11-071-11/+4
| | | | | | | one function. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7403 c06c8d41-db1a-0410-9941-cceddc491573
* Apply the first part of the labyrinth tweaks:j-p-e-g2008-11-041-13/+10
| | | | | | | | | | | | * labyrinths are bordered by (undiggable) metal walls * teleporting inside a labyrinth will always send you away from the centre (as the crow flies: you'll end somewhere in the stone or rock area) Also make sure melded equipment cannot corrode. (I'm still undecided about whether curses should affect melded items.) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7383 c06c8d41-db1a-0410-9941-cceddc491573
* Implement [2147458]. Using Robert's patch (adjusted for trunk), improve dolorous2008-10-081-7/+16
| | | | | | | | low levels of life protection by treating experience pool draining similarly to experience level draining. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7199 c06c8d41-db1a-0410-9941-cceddc491573
* Fix 2148551: items not uppercased.haranp2008-10-061-0/+10
| | | | | | | Other minor fixes. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7157 c06c8d41-db1a-0410-9941-cceddc491573
* Redid monster death idiom so that monsters::hurt can implicitlyharanp2008-10-041-4/+2
| | | | | | | | call monster_die(). (This behaviour can be overriden.) Minor code cleanups elsewhere, removal of dead code from bolt. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7123 c06c8d41-db1a-0410-9941-cceddc491573
* Simplify further.dolorous2008-10-021-54/+53
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7081 c06c8d41-db1a-0410-9941-cceddc491573
* Reworked traps: much much cleaner now. There might be bugs, though.haranp2008-10-011-1/+1
| | | | | | | | | | Traps now remember how much ammo they have. The ammo quantities (from David) are rather tentative. Breaks savefiles. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7076 c06c8d41-db1a-0410-9941-cceddc491573
generated by cgit v1.2.3-54-g00ecf (git 2.45.0) at 2024-05-23 09:19:20 +0000