summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/religion.cc
Commit message (Collapse)AuthorAgeFilesLines
* Apply more commits into 0.4 branch, again mostly by Haran:j-p-e-g2008-12-081-1/+6
| | | | | | | | | | | | | | | | | 6950, 6954, 6959, 6962, 6963, 6965, 6968, 6970 (partly), 6997, 6998, 7001, 7061, 7065, 7071, 7132 (partly), 7174, 7186, 7213, 7233, 7268, 7268, 7293, 7319, 7339, 7358, 7393 (partly) * Tweak a few monster flags. * Fix autoswapping jewellery taking longer than manual swapping. * Fix crash when attempting to create nonexisting monster in wizmode. * Make ego armour descriptions follow abbreviation guidelines. * Fixed buggy monster movement away from the player. * Disabled traps in the Abyss. * Fixed a few other minor bugs, and improves messaging. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@7788 c06c8d41-db1a-0410-9941-cceddc491573
* Merge r7726 from trunk: set acquirement source on items early enough thatzelgadis2008-12-031-5/+6
| | | | | | | it can be used by make_item_randart(). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@7727 c06c8d41-db1a-0410-9941-cceddc491573
* Apply trunk r7099 to 0.4.dolorous2008-10-031-1/+0
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@7100 c06c8d41-db1a-0410-9941-cceddc491573
* Apply trunk r7086 (slightly tweaked) to 0.4.dolorous2008-10-031-0/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@7098 c06c8d41-db1a-0410-9941-cceddc491573
* Apply trunk r7033 to 0.4.dolorous2008-10-021-2/+6
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@7083 c06c8d41-db1a-0410-9941-cceddc491573
* Apply Haran's commits 6773 and 6777-6784 to 0.4.j-p-e-g2008-08-071-6/+5
| | | | | | | | | | | | | | | | * Fix 2037104: amulet of Controlled Flight not autoIDing. * Fix 2038973: explosive tracers leaking information about invisible monsters. * Fix 2039217: check shield status for non-weapons before wielding * Fix 2039734: non-Spriggan transmuters being cheated on UC * Fix 2037845: unstackedness was overriding finishing a deck * Fix 2038476: semicontrolled blink. * Fix 2038962: casting Divine Shield wasn't refreshing AC. * Fix 2038651: real/fake rakshasa identity being leaked in descriptions. * Fix 2035976: doubled inscriptions in equipped items in dump. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6792 c06c8d41-db1a-0410-9941-cceddc491573
* Apply trunk r6775 to 0.4.dolorous2008-08-051-0/+5
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6776 c06c8d41-db1a-0410-9941-cceddc491573
* Fix 2034581: menu colour leaking information on !blood and !mutation.j-p-e-g2008-08-011-9/+11
| | | | | | | Fix 2034526: inscription with { not working git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6748 c06c8d41-db1a-0410-9941-cceddc491573
* Apply the recent commits to branch, update the version and change log toj-p-e-g2008-07-311-15/+15
| | | | | | | 0.4.3. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6740 c06c8d41-db1a-0410-9941-cceddc491573
* Apply r6700 and r6706: Cleansing Flame harming helpless monsters andj-p-e-g2008-07-281-17/+19
| | | | | | | angering TSO, !blood counting towards decks of summoning. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6710 c06c8d41-db1a-0410-9941-cceddc491573
* Apply r6640, r6694 (both by Darshan), r6670 (Haran), r6679 and r6703j-p-e-g2008-07-281-47/+39
| | | | | | | | | | | (me) to branch. Includes TSO no longer granting permanent allies and resultant friendly pickup change, and a number of smaller changes. Also update change log. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6709 c06c8d41-db1a-0410-9941-cceddc491573
* Apply r6620, r6624, r6625, r6628 and r6632 to 0.4.j-p-e-g2008-07-241-1/+2
| | | | | | | | | | | Save existing ghosts back to bones files even for undead players. Fix HP bar blanking out when wrapping. Fix TSO regarding attacks on evil creatures as unchivalric. Fix Twisted Resurrection abominations not counting as undead. Fix monsters being generated with stacks of returning weapons. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6666 c06c8d41-db1a-0410-9941-cceddc491573
* Apply Haran's recent fixes to branch.j-p-e-g2008-07-171-4/+5
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6592 c06c8d41-db1a-0410-9941-cceddc491573
* Apply trunk r6575 to 0.4.dolorous2008-07-161-2/+7
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6576 c06c8d41-db1a-0410-9941-cceddc491573
* Apply commits r6556 and r6557 to 0.4.j-p-e-g2008-07-151-15/+0
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6558 c06c8d41-db1a-0410-9941-cceddc491573
* Apply trunk r6548 to 0.4.dolorous2008-07-151-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6549 c06c8d41-db1a-0410-9941-cceddc491573
* Apply trunk r6474 to 0.4.dolorous2008-07-101-2/+7
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6475 c06c8d41-db1a-0410-9941-cceddc491573
* Apply trunk r6462 to 0.4.dolorous2008-07-101-6/+3
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6468 c06c8d41-db1a-0410-9941-cceddc491573
* Fix 2012088: Monsters "following" you from the Abyss to the wrong level.j-p-e-g2008-07-071-1/+1
| | | | | | | A few fixes to starting equipment and skills. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6440 c06c8d41-db1a-0410-9941-cceddc491573
* Another clean up, and add some new weapon speech.j-p-e-g2008-07-071-32/+11
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6439 c06c8d41-db1a-0410-9941-cceddc491573
* Fix two erroneous replacements with x_chance_in_y(). The rest werej-p-e-g2008-07-061-4/+4
| | | | | | | correct. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6429 c06c8d41-db1a-0410-9941-cceddc491573
* Add a function x_chance_in_y(x,y) to replace the variousj-p-e-g2008-07-061-10/+9
| | | | | | | | random2(y) < x checks, e.g. x_chance_in_y(weight, totalweight). This should make things a bit more readable. Apply it to a number of files. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6428 c06c8d41-db1a-0410-9941-cceddc491573
* Fix 2011201: Disallow summoned orcs from joining a worshipper of Beogh.j-p-e-g2008-07-051-7/+7
| | | | | | | | Fix 2011258: Consolidate named orcs correctly in the monster list. Fix 2010542: Patrolling monsters forgetting the player too quickly. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6408 c06c8d41-db1a-0410-9941-cceddc491573
* Tweak some descriptions.j-p-e-g2008-07-051-1/+1
| | | | | | | | | | Also: Some of the abilities don't have any descriptions yet, so if anyone has an idea, please add some. (Even bland one-liners are better than "has no description yet" but I've run out of ideas and am not even sure what most of the remaining ones do.) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6404 c06c8d41-db1a-0410-9941-cceddc491573
* Bug 2011077: if the damage from a lightning bolt causes an orc to surrenderzelgadis2008-07-051-1/+15
| | | | | | | | | to the player, don't give penance if the lightning bolt bounces and hits the now friendly orc. Uses the same setup and logic as for preventing lightning bounces from causing penance with TSO. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6403 c06c8d41-db1a-0410-9941-cceddc491573
* Add minor cosmetic fixes.dolorous2008-07-041-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6386 c06c8d41-db1a-0410-9941-cceddc491573
* A few more cleanups.haranp2008-07-021-6/+4
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6349 c06c8d41-db1a-0410-9941-cceddc491573
* Improve Nemelex descriptions (Haran).dploog2008-07-021-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6341 c06c8d41-db1a-0410-9941-cceddc491573
* Outsource the description of Xom's powers (so to speak) instead of dolorous2008-07-011-1/+1
| | | | | | | hardcoding it. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6296 c06c8d41-db1a-0410-9941-cceddc491573
* Bug 2004786: a lightning bolt bouncing and hitting a monster a second/tird/etczelgadis2008-07-011-1/+26
| | | | | | | | | | 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
* Fix 2007064: Assertion error when changing religion as a Lugonu Chaosj-p-e-g2008-06-301-1/+1
| | | | | | | Knight while still in the Abyss (only possible in wizard mode) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6270 c06c8d41-db1a-0410-9941-cceddc491573
* Only attempt to change the attitudes of holy beings if we're dumping a dolorous2008-06-301-2/+5
| | | | | | | good god, not if we're dumping any god. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6268 c06c8d41-db1a-0410-9941-cceddc491573
* Add yet more minor cosmetic fixes.dolorous2008-06-301-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6266 c06c8d41-db1a-0410-9941-cceddc491573
* Add Lugonu to the list of chaotic gods for Zin's Recital purposes.dolorous2008-06-301-2/+2
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6246 c06c8d41-db1a-0410-9941-cceddc491573
* Enable Chaos Knights of Lugonu starting out in the Abyss.j-p-e-g2008-06-301-1/+2
| | | | | | | | | | | | | | | | | | | I've marked these characters with GDT_GAME_START, so that * the player starts out on an altar to Lugonu * there's an exit back to the Dungeon near-by * returning into the Dungeon always places them into the entry vault on level 1 * no abyssal runes are ever generated * item generation matches that of level 1 * monster spawn rates are that of the orb run to enforce a quick return into the Dungeon Once the player returns to the Dungeon (via an exit or with Lugonu's first power) char_direction is properly set to GDT_DESCENDING and from then on the game continues as if they had started in the Dungeon. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6245 c06c8d41-db1a-0410-9941-cceddc491573
* Simplify.dolorous2008-06-301-9/+4
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6232 c06c8d41-db1a-0410-9941-cceddc491573
* Properly mark poisoned ammunition as evil for TSO worshippers.dolorous2008-06-301-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6230 c06c8d41-db1a-0410-9941-cceddc491573
* Mark known mutagenic randarts as evil items for Zin worshippers.dolorous2008-06-301-0/+6
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6229 c06c8d41-db1a-0410-9941-cceddc491573
* Fix typo.dolorous2008-06-301-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6228 c06c8d41-db1a-0410-9941-cceddc491573
* Mark potions of mutation as evil for Zin worshippers, and poisoned dolorous2008-06-301-5/+30
| | | | | | | | weapons and ammunition as evil for TSO worshippers. Also, mark all demonic weapons as evil, whether their types are known or not. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6227 c06c8d41-db1a-0410-9941-cceddc491573
* Note that Zin dislikes polymorphing monsters, and mark wands of polymorphzelgadis2008-06-291-0/+10
| | | | | | | other as evil items for Zin worshipers. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6226 c06c8d41-db1a-0410-9941-cceddc491573
* Only use "greater healing" (fixes 2002446).dploog2008-06-291-2/+2
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6225 c06c8d41-db1a-0410-9941-cceddc491573
* Add gods' powers and abilities to their descriptions, viewable via ^!j-p-e-g2008-06-291-8/+17
| | | | | | | | | (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-2/+2
| | | | | | | instead of an actor* parameter. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6208 c06c8d41-db1a-0410-9941-cceddc491573
* Fix 2005269: trolls being capable of wearing almost all armour types.j-p-e-g2008-06-281-8/+10
| | | | | | | Remove dated mentions of item sacrifices in print_god_likes(). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6188 c06c8d41-db1a-0410-9941-cceddc491573
* Add minor cosmetic fixes.dolorous2008-06-271-12/+12
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6162 c06c8d41-db1a-0410-9941-cceddc491573
* Misc. minor cleanups. (Yes, a huge amount of them but still...)j-p-e-g2008-06-261-80/+78
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6146 c06c8d41-db1a-0410-9941-cceddc491573
* Simplify.dolorous2008-06-261-27/+32
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6144 c06c8d41-db1a-0410-9941-cceddc491573
* For functions that return char*'s, don't return a c_str() of an dolorous2008-06-251-5/+5
| | | | | | | | | | | | | | | std::string, since as soon as the function returns, the std::string goes out of scope, and the c_str() becomes a dangling pointer, which usually points to the same area as before, but occasionally points to garbage. Instead, make them return std::string's, and call c_str() on the return value outside the functions. Among other things, this should fix [1999515]. Note that I've only fixed direct c_str() returns for now. There might be some indirect ones that I missed. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6139 c06c8d41-db1a-0410-9941-cceddc491573
* Add miscellaneous minor fix.dolorous2008-06-241-0/+3
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6116 c06c8d41-db1a-0410-9941-cceddc491573