summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/religion.h
Commit message (Collapse)AuthorAgeFilesLines
* Apply trunk r6474 to 0.4.dolorous2008-07-101-0/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6475 c06c8d41-db1a-0410-9941-cceddc491573
* Bug 2004786: a lightning bolt bouncing and hitting a monster a second/tird/etczelgadis2008-07-011-0/+2
| | | | | | | | | | time shouldn't be an unchivalrous attack if the first hit wasn't unchivalrous. Before this fix the damage from the first hit from a lightning bolt might make a monster flee, and then the subsequent hits from bounces would be unchivalrous since it was fleeing. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6272 c06c8d41-db1a-0410-9941-cceddc491573
* Simplify.dolorous2008-06-301-1/+0
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6232 c06c8d41-db1a-0410-9941-cceddc491573
* Add gods' powers and abilities to their descriptions, viewable via ^!j-p-e-g2008-06-291-2/+3
| | | | | | | | | (as well as when praying at an altar) and when searching the database. Texts might need to be tweaked a bit but it's a *huge* improvement. (Thanks to whoever had that idea!) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6216 c06c8d41-db1a-0410-9941-cceddc491573
* Make tso_unchivalric_attack_safe_monster() take a monsters* parameter dolorous2008-06-291-1/+1
| | | | | | | instead of an actor* parameter. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6208 c06c8d41-db1a-0410-9941-cceddc491573
* Add various god gift-related cleanups.dolorous2008-06-191-0/+3
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5966 c06c8d41-db1a-0410-9941-cceddc491573
* Simplify.dolorous2008-06-171-3/+3
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5918 c06c8d41-db1a-0410-9941-cceddc491573
* Fix attack conduct handling to register more than one conduct for an dolorous2008-06-171-1/+3
| | | | | | | | | | | | | | | attack again. For example, if you make an unchivalric attack on a neutral monster, both the "unchivalric attack" and "attack neutral" conducts will be handled again, instead of just the former (big oops). Passing a constant-sized array of god_conduct_triggers and adding wrapper functions to enable and disable them all is not the most elegant solution, but I don't quite have the time or the understanding right now to rewrite the god_conduct_trigger class to handle more than one conduct at once, and this does work in the meantime. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5914 c06c8d41-db1a-0410-9941-cceddc491573
* Move the tutorial descriptions of gods' likes and dislikes intoj-p-e-g2008-06-151-0/+5
| | | | | | | | | | | | | | | functions of their own, and reuse them in the god descriptions ('^' screen, when praying at altars, and when searching the database). What's still missing is some sort of "What this god offers you". The current handling makes gods like Lugonu, who have no restrictions and demand very little, appear like no-brainers, when of course the whole thing is much more complicated. I'll also be adding some extended information for the ^ screen (thus for your own god only). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5870 c06c8d41-db1a-0410-9941-cceddc491573
* Consolidate the checks for gods that give you permanent followers into a dolorous2008-06-141-0/+1
| | | | | | | | | function, and have it take the other good gods into account, since, if you switch from TSO to another good god, you keep all your non-daeva permanent followers. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5821 c06c8d41-db1a-0410-9941-cceddc491573
* Add follower-related cleanups.dolorous2008-06-131-1/+2
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5797 c06c8d41-db1a-0410-9941-cceddc491573
* Yikes, so many files! And all I did was add more item evaluationj-p-e-g2008-06-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | functions for menu colouring and pickup... Added: emergency_item, good_item, dangerous_item, bad_item, and useless_item, all taking into account player species and mutations, so e.g. =see invisible is useless for Naga, and !poison is always bad but only useless if you don't know Evaporate. Never autopickup useless, dangerous (e.g. ?immolation) or inedible items, and simplify the item colour/pickup options accordingly. I'll have to see if pickup.lua is still even needed after this. Removed the menu_colour_prefix_id option as I can't see any reason to turn it off. Oh, and fixed a bug where Kenku were unable to stop levitating if they gained level 15 while levitating. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5658 c06c8d41-db1a-0410-9941-cceddc491573
* Add missing prototype.dolorous2008-06-011-0/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5411 c06c8d41-db1a-0410-9941-cceddc491573
* Simplify.dolorous2008-05-311-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5365 c06c8d41-db1a-0410-9941-cceddc491573
* Modify tutorial messages for the new triggers. Thanks again, Matthew! :)j-p-e-g2008-05-291-0/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5328 c06c8d41-db1a-0410-9941-cceddc491573
* Move set_attack_conducts() to religion.cc, as it really belongs there.dolorous2008-05-251-0/+2
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5243 c06c8d41-db1a-0410-9941-cceddc491573
* Rearrange the order of a few functions.dolorous2008-05-251-26/+25
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5242 c06c8d41-db1a-0410-9941-cceddc491573
* Run through the god conducts for killing if we make a bad kill of a dolorous2008-05-201-0/+1
| | | | | | | summoned creature (e.g. a living kill while praying to Elyvilon). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5166 c06c8d41-db1a-0410-9941-cceddc491573
* Remove redundant declarations.dolorous2008-05-171-3/+0
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5098 c06c8d41-db1a-0410-9941-cceddc491573
* For TSO, change the "stabbing" conduct to an "unchivalrous attack" dolorous2008-05-171-1/+1
| | | | | | | | | conduct, and exercise it on every stabbing attempt, whether it succeeds or not (and also whether the player is berserk or not, since a berserk player trying to stab seems unchivalrous to me). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5093 c06c8d41-db1a-0410-9941-cceddc491573
* Remove now-unneeded prototype.dolorous2008-05-071-1/+0
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4904 c06c8d41-db1a-0410-9941-cceddc491573
* Add a follower-handling routine for Trog, in case he's ever expanded to dolorous2008-05-071-0/+1
| | | | | | | allow for blessing followers. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4899 c06c8d41-db1a-0410-9941-cceddc491573
* [1956565] Fix issues with monster names.dshaligram2008-05-041-1/+1
| | | | | | | | | Monster names are now stored in the monster struct and saved. Changed some monster-finding functions to return monsters* instead of monster index for type-safety. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4859 c06c8d41-db1a-0410-9941-cceddc491573
* Some cleanup in the blessing routines. j-p-e-g2008-04-241-1/+1
| | | | | | | | | | Possibly fix a crash when calling bless_follower without an argument (it only happened with Beogh and TSO, so this is the most likely candidate). Outsource Boris' "I'll be back" speech. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4591 c06c8d41-db1a-0410-9941-cceddc491573
* * Add a wizard function apply_monster_blessing to allow for easy testingj-p-e-g2008-04-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | of dolorous' fabulous blessing routines. * Allow the possibility of naming monsters: A monster's random name seed is stored in its number property, and the actual name gets picked from randname.txt. (Once this leaves the experimental stage I'll move them into a file of their own.) This means that monster types that already use number for something else (hydras for #heads, manticores for #spikes, or zombies for monster type) cannot be named. Use the new functions for naming orcs blessed by Beogh. Only non-generic orcs may get named, e.g. orcs promoted to priesthood or orc warriors that get their weapon enchanted. I tried to come up with a number of thematic orcish names, and if anyone would like to contribute, they're welcome to do so. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4586 c06c8d41-db1a-0410-9941-cceddc491573
* Clean up follower and cleansing flame routines some more. If you dolorous2008-04-191-1/+1
| | | | | | | | worship a good god, cleansing flame will no longer damage neutral monsters, since attacking neutrals offends the good gods. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4393 c06c8d41-db1a-0410-9941-cceddc491573
* Generalize god_hates_your_god() further.dolorous2008-04-081-1/+4
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4136 c06c8d41-db1a-0410-9941-cceddc491573
* Generalize god_hates_your_god() for use in divine retribution.dolorous2008-04-081-0/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4135 c06c8d41-db1a-0410-9941-cceddc491573
* Like Beogh, have TSO randomly bless a follower when you kill evil (as an dolorous2008-03-291-1/+1
| | | | | | | | alternative to the health restoration). Also, clean up TSO's other blessing routines again. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3930 c06c8d41-db1a-0410-9941-cceddc491573
* Consolidate and clean up some of the blessing code.dolorous2008-03-291-3/+4
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3928 c06c8d41-db1a-0410-9941-cceddc491573
* Add the beginnings of TSO follower blessings. Assume that followers are dolorous2008-03-281-0/+1
| | | | | | | | | | | any living friendly or charmed monsters. Deliberately don't check for evil or unholy status; that should help shake out cases where you can get them. Currently, only do blessings on followers that kill evil monsters 1/3 of the time, instead of gaining power as they normally would. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3923 c06c8d41-db1a-0410-9941-cceddc491573
* Make Zin take retribution on you if you switch to a chaotic god as well dolorous2008-03-241-0/+1
| | | | | | | | | as an evil god (i.e. Xom), and display a message when switching from a good god to an evil god to indicate pending retribution. TSO still has his usual "you will pay" speech, of course. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3846 c06c8d41-db1a-0410-9941-cceddc491573
* Expand bless_follower() to allow explicitly picking the follower as well dolorous2008-03-231-1/+2
| | | | | | | | | | | | | as picking one randomly, fix a potential problem with the display of the blessing message, and add a piety-dependent chance that followers will be specifically blessed when gaining levels. Hook the last of these up to Beogh for now (since the random chance on piety gain occurs less and less often as piety goes up). TSO should also get this eventually. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3821 c06c8d41-db1a-0410-9941-cceddc491573
* Add somewhat experimental code to bless random followers. Currently, dolorous2008-03-201-0/+2
| | | | | | | | | it's only used for Beogh, and its only effects are full healing and full healing with one or two added hit points. Eventually, it should get more effects, and be expanded for use by TSO. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3752 c06c8d41-db1a-0410-9941-cceddc491573
* Outsource more speech:j-p-e-g2008-03-201-1/+2
| | | | | | | | | * Beogh's rants on destroying one of his idols * orcs converting to you * holy beings becoming neutral git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3745 c06c8d41-db1a-0410-9941-cceddc491573
* Add a few last Beogh-related cleanups. As part of this, move the check dolorous2008-03-191-0/+2
| | | | | | | | for an orcish follower into its own function, so that it can eventually be used for blessing followers. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3715 c06c8d41-db1a-0410-9941-cceddc491573
* Holy being adjustments: If you've turned them neutral on sight, and then dolorous2008-03-141-1/+1
| | | | | | | | switch to a neutral or evil god, they'll turn hostile. Also, TSO's god gifts will only turn neutral if you switch from him to another good god. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3630 c06c8d41-db1a-0410-9941-cceddc491573
* [Bug 1907221] Add "Modified for Crawl Reference" statement and author to aj-p-e-g2008-03-081-1/+1
| | | | | | | | huge number of files. Also correct file name comments. No coding changes. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3539 c06c8d41-db1a-0410-9941-cceddc491573
* Implement evil item sacrifices for TSO: all evil weapons, plus wands of dolorous2008-03-041-1/+1
| | | | | | | | | draining, scrolls of torment, staves of death, rods of demonology, and lanterns of shadows. Expand is_evil_weapon() to cover these, and rename it is_evil_item(). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3517 c06c8d41-db1a-0410-9941-cceddc491573
* Properly rename the last holy being neutrality function (oops).dolorous2008-03-031-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3513 c06c8d41-db1a-0410-9941-cceddc491573
* Tweak DID_KILL_HOLY handling to allow for killing hostile angels j-p-e-g2008-02-121-1/+1
| | | | | | | | | without being put under penance by the good gods. Also add a flag MF_WAS_NEUTRAL, so that previously neutral monsters can be handled differently from always hostile ones. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3432 c06c8d41-db1a-0410-9941-cceddc491573
* A pious follower of the good gods can now turn holy beings neutral on dolorous2008-02-051-0/+2
| | | | | | | | | | | | | | sight, a la Beogh and orcs; the more pious the follower is, the greater the chance (piety > random2(200)). Additional chances to turn holy beings neutral come up when the follower works off all penance or gains a new piety level. The neutrality check will fail half the time if the follower wields an evil weapon, and if the follower switches to an evil god, all neutral and friendly holy beings will turn hostile. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3397 c06c8d41-db1a-0410-9941-cceddc491573
* Nemelex abandonment now shuffles and unmarks all decks.haranp2007-12-011-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2962 c06c8d41-db1a-0410-9941-cceddc491573
* Add one more cleanup of protection from harm. Since there's more than dolorous2007-12-011-1/+10
| | | | | | | | | one type of it now, expand god_protects_from_harm() to include the logic for when certain gods do it. Also, as brought up on crawl-ref-discuss, make Elyvilon do it both casually and during prayer. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2959 c06c8d41-db1a-0410-9941-cceddc491573
* [1836426] Fixed penance message sequence for beams, clamped penance messages ↵dshaligram2007-11-281-0/+27
| | | | | | at one per turn. (Penance message sequence for melee combat not fixed yet.) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2926 c06c8d41-db1a-0410-9941-cceddc491573
* Clean up and consolidate all the smiting routines into the new function dolorous2007-11-241-0/+3
| | | | | | | | | | | | god_smites_you(). This fixes a problem where you could worship Beogh, draw the Wrath card to make him smite you, and have him possibly protect you from his own smiting. The smiting code in beogh_idol_revenge() wouldn't allow this, but the smiting code in beogh_retribution() would. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2906 c06c8d41-db1a-0410-9941-cceddc491573
* Add minor cleanups of divine protection from harm:dolorous2007-11-221-0/+1
| | | | | | | | | | | * move the list of gods that do it into the function god_protects_from_harm(), instead of hardcoding the list in two places * update the description of it, both in the code and the surrounding comments, since it no longer depends on prayer, and since it can now happen with piety less than 30 git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2892 c06c8d41-db1a-0410-9941-cceddc491573
* * Add Cannibalism to list of forbidded actions for good gods.j-p-e-g2007-11-131-1/+1
| | | | | | | | | * Add simple warning message (god "did not appreciate that!") when using unID'd items that would otherwise be penalized. * Change protection from harm to be independent of prayer. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2849 c06c8d41-db1a-0410-9941-cceddc491573
* Added you.good_god() and you.evil_god() to check if the player is ↵dshaligram2007-11-011-0/+3
| | | | | | worshipping a good/evil god. Passing a god name is optional, and will check if that god is good/evil (you.good_god("Elyvilon") == true). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2715 c06c8d41-db1a-0410-9941-cceddc491573
* Beogh conversion fixes for trunk.j-p-e-g2007-10-291-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2660 c06c8d41-db1a-0410-9941-cceddc491573