summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/xom.cc
Commit message (Collapse)AuthorAgeFilesLines
* Merge r7726 from trunk: set acquirement source on items early enough thatzelgadis2008-12-031-5/+4
| | | | | | | 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
* Another clean up, and add some new weapon speech.j-p-e-g2008-07-071-20/+20
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6439 c06c8d41-db1a-0410-9941-cceddc491573
* Add comment.dolorous2008-07-061-0/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6431 c06c8d41-db1a-0410-9941-cceddc491573
* Add a function x_chance_in_y(x,y) to replace the variousj-p-e-g2008-07-061-11/+11
| | | | | | | | 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
* Add minor cosmetic fixes.dolorous2008-07-051-4/+7
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6414 c06c8d41-db1a-0410-9941-cceddc491573
* Fix [2011384]: Make Xom's divine lightning conditional on dangerous dolorous2008-07-051-26/+29
| | | | | | | monsters' being nearby again. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6413 c06c8d41-db1a-0410-9941-cceddc491573
* Make Xom's vitrification effect less common, as it's a lasting effect.dolorous2008-07-041-13/+13
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6384 c06c8d41-db1a-0410-9941-cceddc491573
* Comment fix.dolorous2008-07-011-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6290 c06c8d41-db1a-0410-9941-cceddc491573
* Fix dangling pointers again (oops).dolorous2008-06-301-6/+6
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6252 c06c8d41-db1a-0410-9941-cceddc491573
* Simplify.dolorous2008-06-271-6/+6
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6165 c06c8d41-db1a-0410-9941-cceddc491573
* If Xom turns a monster into a shapeshifter, properly anger it if you dolorous2008-06-271-0/+4
| | | | | | | worship Zin at the time. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6164 c06c8d41-db1a-0410-9941-cceddc491573
* Add const.dolorous2008-06-251-8/+9
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6141 c06c8d41-db1a-0410-9941-cceddc491573
* For functions that return char*'s, don't return a c_str() of an dolorous2008-06-251-32/+31
| | | | | | | | | | | | | | | 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 more minor cosmetic fixes.dolorous2008-06-251-4/+4
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6138 c06c8d41-db1a-0410-9941-cceddc491573
* Add another minor cosmetic fix.dolorous2008-06-241-0/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6132 c06c8d41-db1a-0410-9941-cceddc491573
* Add minor cosmetic fix.dolorous2008-06-241-2/+2
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6127 c06c8d41-db1a-0410-9941-cceddc491573
* Simplify Xom's choosing of a random potion effect more.dolorous2008-06-241-17/+16
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6126 c06c8d41-db1a-0410-9941-cceddc491573
* Simplify Xom's choosing of a random potion effect.dolorous2008-06-241-13/+13
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6125 c06c8d41-db1a-0410-9941-cceddc491573
* Add minor cosmetic fixes.dolorous2008-06-241-8/+8
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6124 c06c8d41-db1a-0410-9941-cceddc491573
* Simplify Xom's polymorphing monsters.dolorous2008-06-241-39/+34
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6123 c06c8d41-db1a-0410-9941-cceddc491573
* Simplify Xom's mutating the player.dolorous2008-06-241-30/+31
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6122 c06c8d41-db1a-0410-9941-cceddc491573
* Properly handle Xom's failing to summon hostile monsters.dolorous2008-06-241-5/+13
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6121 c06c8d41-db1a-0410-9941-cceddc491573
* Properly handle Xom's failing to drain or torment the player.dolorous2008-06-241-10/+21
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6120 c06c8d41-db1a-0410-9941-cceddc491573
* Simplify.dolorous2008-06-241-7/+5
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6119 c06c8d41-db1a-0410-9941-cceddc491573
* Make xom_gives_item() static.dolorous2008-06-241-3/+3
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6118 c06c8d41-db1a-0410-9941-cceddc491573
* Fix bad logic for determining the behavior of Xom's factions.dolorous2008-06-241-10/+7
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6104 c06c8d41-db1a-0410-9941-cceddc491573
* Add more miscellaneous minor fixes.dolorous2008-06-241-6/+4
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6102 c06c8d41-db1a-0410-9941-cceddc491573
* Add yet another message tweak.dolorous2008-06-241-4/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6101 c06c8d41-db1a-0410-9941-cceddc491573
* Simplify.dolorous2008-06-241-6/+6
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6100 c06c8d41-db1a-0410-9941-cceddc491573
* Clean up Xom's friendly multiple summoning routine again.dolorous2008-06-241-43/+46
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6098 c06c8d41-db1a-0410-9941-cceddc491573
* Clean up Xom's single summoning routines again.dolorous2008-06-241-25/+29
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6097 c06c8d41-db1a-0410-9941-cceddc491573
* Add another message tweak.dolorous2008-06-241-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6096 c06c8d41-db1a-0410-9941-cceddc491573
* Simplify.dolorous2008-06-241-5/+3
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6095 c06c8d41-db1a-0410-9941-cceddc491573
* Add more comment fixes.dolorous2008-06-241-3/+4
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6094 c06c8d41-db1a-0410-9941-cceddc491573
* If Xom gives you multiple non-demonic summons, make them friendly only dolorous2008-06-241-2/+11
| | | | | | | 3/4 of the time, for consistency with single non-demonic summons. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6093 c06c8d41-db1a-0410-9941-cceddc491573
* Comment fixes.dolorous2008-06-241-4/+3
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6092 c06c8d41-db1a-0410-9941-cceddc491573
* Display the proper message when Xom fails to animate your weapon against dolorous2008-06-231-8/+8
| | | | | | | you. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6081 c06c8d41-db1a-0410-9941-cceddc491573
* Simplify.dolorous2008-06-231-1/+4
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6079 c06c8d41-db1a-0410-9941-cceddc491573
* Tweak messages yet again.dolorous2008-06-231-2/+2
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6077 c06c8d41-db1a-0410-9941-cceddc491573
* Tweak messages again.dolorous2008-06-231-2/+2
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6076 c06c8d41-db1a-0410-9941-cceddc491573
* Fix compilation.dolorous2008-06-231-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6073 c06c8d41-db1a-0410-9941-cceddc491573
* Make Xom's failure messages a bit more varied.dolorous2008-06-231-4/+4
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6071 c06c8d41-db1a-0410-9941-cceddc491573
* Add more miscellaneous minor fixes.dolorous2008-06-231-2/+2
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6070 c06c8d41-db1a-0410-9941-cceddc491573
* For Xom, use the "No, never mind." failure message instead of the canned dolorous2008-06-231-7/+6
| | | | | | | failure message. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6069 c06c8d41-db1a-0410-9941-cceddc491573
* Add a few more minor cosmetic fixes, and make dolorous2008-06-231-28/+28
| | | | | | | xom_makes_you_cast_random_spell() static. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6068 c06c8d41-db1a-0410-9941-cceddc491573
* Add minor cosmetic fixes.dolorous2008-06-231-39/+39
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6065 c06c8d41-db1a-0410-9941-cceddc491573
* Really fix message sequences again.dolorous2008-06-231-88/+66
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6064 c06c8d41-db1a-0410-9941-cceddc491573
* Fix message sequences again.dolorous2008-06-231-16/+13
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6063 c06c8d41-db1a-0410-9941-cceddc491573
* Refix Xom's mixed summons.dolorous2008-06-231-22/+28
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6062 c06c8d41-db1a-0410-9941-cceddc491573
* Put the messages in the right sequence if Xom fails to animate your dolorous2008-06-231-8/+8
| | | | | | | weapon or summon hostile demons. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6061 c06c8d41-db1a-0410-9941-cceddc491573
generated by cgit v1.2.3-54-g00ecf (git 2.45.1) at 2024-05-29 07:36:33 +0000