summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/acr.cc
Commit message (Collapse)AuthorAgeFilesLines
* Apply more commits into 0.4 branch, again mostly by Haran:j-p-e-g2008-12-081-1/+2
| | | | | | | | | | | | | | | | | 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
* Apply a bunch of trunk commits, mostly by Haran, namely:j-p-e-g2008-12-081-0/+18
| | | | | | | | | | | | | | | | | | 6766 (partly), 6834 (partly), 6867, 6892, 6903, 6906, 6908, 6909, 6927, 6928, 6929, 6943, 6945, 6946 * Message/description tweaks. * Fix enchanting hides not updating AC. * Fix incorrect score calculation. * All 't' commands now take a turn. * Don't prompt when swapping into dangerous terrain. * Fix backwards stealth check. * Fix off-by-1 error when selecting starting weapon. * Lichform discards holy wrath weapons. * Reinitialise zap counter for recharged wands, mention charges. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@7786 c06c8d41-db1a-0410-9941-cceddc491573
* Merge r7717 and r7718: improvements to interrupted butchery behaviour.zelgadis2008-12-021-17/+0
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@7719 c06c8d41-db1a-0410-9941-cceddc491573
* Merge r7607: prevent crash if command repetition is interupted by multiplezelgadis2008-11-251-2/+5
| | | | | | | "`"s. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@7609 c06c8d41-db1a-0410-9941-cceddc491573
* Backport r6743, 6750, 6753, 6771, 6772, 6790 to 0.4.j-p-e-g2008-08-071-0/+6
| | | | | | | | | | | | | | * Fix 2033984: Monsters being created with both a shield and a 2-hander. * FR 2026227: Make $ list current gold. * Fix assertion failure upon high-scoring death. * Fix 2037146: Make hill giants use MONUSE_STARTING_EQUIPMENT. * Fix 2036429: better spacing on ^ screen. * Replace "Level:" with "Place:" in the HUD. Also start on 0.4.4 change log. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6791 c06c8d41-db1a-0410-9941-cceddc491573
* Apply the recent commits to branch, update the version and change log toj-p-e-g2008-07-311-6/+7
| | | | | | | 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
* Trunk->0.4 r6718: Don't lose level-up stat and hp gain if Crawl receives ↵dshaligram2008-07-291-0/+6
| | | | | | SIGHUP at the level-up prompt. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6719 c06c8d41-db1a-0410-9941-cceddc491573
* Apply r6640, r6694 (both by Darshan), r6670 (Haran), r6679 and r6703j-p-e-g2008-07-281-3/+3
| | | | | | | | | | | (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
* Trunk->0.4 r6707: Fix HUD updates overwriting dgl message indicator, changed ↵dshaligram2008-07-281-2/+9
| | | | | | indicator from (msg) to (Hit _). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6708 c06c8d41-db1a-0410-9941-cceddc491573
* Merge r6587, keybindings. Fixes bug 2018200: macros not working with thezelgadis2008-07-261-130/+7
| | | | | | | old 0.3.4 keymap. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6682 c06c8d41-db1a-0410-9941-cceddc491573
* Trunk->0.4 merge r6659-6660: [2026251] Elf arrival vault fix, debug_mons_scan.dshaligram2008-07-241-0/+3
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6661 c06c8d41-db1a-0410-9941-cceddc491573
* Applying r6609 to 0.4.ennewalker2008-07-191-2/+7
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6610 c06c8d41-db1a-0410-9941-cceddc491573
* Apply commit r6569 to 0.4 trunk.j-p-e-g2008-07-151-12/+8
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6570 c06c8d41-db1a-0410-9941-cceddc491573
* Apply commits r6556 and r6557 to 0.4.j-p-e-g2008-07-151-22/+14
| | | | 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 r6533 to 0.4.dolorous2008-07-131-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6534 c06c8d41-db1a-0410-9941-cceddc491573
* Apply my latest commits to 0.4.j-p-e-g2008-07-131-2/+2
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6531 c06c8d41-db1a-0410-9941-cceddc491573
* Apply my previous commit to 0.4.j-p-e-g2008-07-111-2/+2
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6503 c06c8d41-db1a-0410-9941-cceddc491573
* Apply trunk r6470 to 0.4.dolorous2008-07-101-2/+2
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6471 c06c8d41-db1a-0410-9941-cceddc491573
* Apply recent commits to 0.4, including Matthew's evil zoo fix.j-p-e-g2008-07-091-0/+4
| | | | | | | Now how do I change the properties to native again? git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6465 c06c8d41-db1a-0410-9941-cceddc491573
* Update documentation for 0.4.j-p-e-g2008-07-081-3/+5
| | | | | | | Apply recent commits. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6458 c06c8d41-db1a-0410-9941-cceddc491573
* Another clean up, and add some new weapon speech.j-p-e-g2008-07-071-7/+7
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6439 c06c8d41-db1a-0410-9941-cceddc491573
* Add a few comments.j-p-e-g2008-07-071-1/+2
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6438 c06c8d41-db1a-0410-9941-cceddc491573
* Fix the old issue of switching to the butchering tool before actuallyj-p-e-g2008-07-071-3/+3
| | | | | | | | | | | | | | | | | | | | deciding on which corpse to butcher. Now, if there's no eligible tool to automatically switch to (or the autoswitch option is false) you get prompted at the beginning of the butchering routine but you don't actually switch weapons or take off your gloves until right before you start butchering. Obviously, the same applies when autoswitching. This means you don't lose a turn anymore if you change your mind in-between. I really hope I haven't introduced other bugs this way but a fix was badly in need since I'd changed the automatic weapon swap to take a turn just as the manual swap does. Also fix swap_when_safe so that it also working when the real weapon is on slot 'a' (== 0) which will probably be the norm rather than an exception. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6437 c06c8d41-db1a-0410-9941-cceddc491573
* Fix 2010077: Increase respawning rates again.j-p-e-g2008-07-061-0/+12
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6430 c06c8d41-db1a-0410-9941-cceddc491573
* Disallow vampires from draining summoned creatures to be consistent withj-p-e-g2008-07-041-81/+73
| | | | | | | | | | | | | summoned creatures being incapable of bleeding on the floor. This makes things more difficult for Vampires; on the other hand there was a (more or less) recent change that lets them regain 1 hp *per turn* when draining corpses. We might also increase the duration of blood potions... Apart from that, various clean-ups. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6393 c06c8d41-db1a-0410-9941-cceddc491573
* Tweak change log a bit and add new commands to 034_changes.txt. Arej-p-e-g2008-07-041-1/+1
| | | | | | | | there more new commands I've forgotten? Please don't include wizmode commands as they don't matter during normal game. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6387 c06c8d41-db1a-0410-9941-cceddc491573
* Add spelling fixes where possible: "gray" -> "grey".dolorous2008-07-041-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6381 c06c8d41-db1a-0410-9941-cceddc491573
* Fix 2008767: "random" not working for book choice optionj-p-e-g2008-07-031-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6375 c06c8d41-db1a-0410-9941-cceddc491573
* Remove debugging statement, minor clean up.j-p-e-g2008-07-031-1/+3
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6369 c06c8d41-db1a-0410-9941-cceddc491573
* Only apply targeting via monster list to spells and such wherej-p-e-g2008-07-021-1/+1
| | | | | | | targeting monsters is actually needed. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6338 c06c8d41-db1a-0410-9941-cceddc491573
* Revert the change on ammo handling for Tiles, and replace it with a morej-p-e-g2008-07-021-1/+2
| | | | | | | | | | | | | | | generic logic that uses item tiles for BEAM_MISSILE, else bolts according to flavour. Identify monster fired ammunition ego if the launcher ego is known, not that it has much of an effect because plain ammo gets no special description. In the message list the fired item as it will look to the player (i.e. "arrow of ice" for a plain arrow fired off a bow of frost), even though the item actually dropped will still be a plain one. I hope this isn't too confusing. (And if it is, it should be easy to revert. :p) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6331 c06c8d41-db1a-0410-9941-cceddc491573
* Don't let the player swap places with stationary monsters.zelgadis2008-07-021-0/+1
| | | | | | | | Let monsters inside sanctuary swap places if they're (probably) going in opposite directions. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6329 c06c8d41-db1a-0410-9941-cceddc491573
* For Tiles, use some of the other wall types in the Abyss as well to makej-p-e-g2008-07-011-2/+2
| | | | | | | it more interesting. The rest is mostly clean-up. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6307 c06c8d41-db1a-0410-9941-cceddc491573
* Bug 2004786: a lightning bolt bouncing and hitting a monster a second/tird/etczelgadis2008-07-011-1/+1
| | | | | | | | | | 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
* When starting in the Abyss, randomize the colors properly.dolorous2008-06-301-0/+6
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6260 c06c8d41-db1a-0410-9941-cceddc491573
* Add more minor cosmetic fixes.dolorous2008-06-301-4/+5
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6256 c06c8d41-db1a-0410-9941-cceddc491573
* Enable Chaos Knights of Lugonu starting out in the Abyss.j-p-e-g2008-06-301-2/+8
| | | | | | | | | | | | | | | | | | | 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
* Fix good random secondary choices during character selection.j-p-e-g2008-06-291-2/+6
| | | | | | | | Re-enable quivering with '(' - still buggy, and I'm trying to work out why, but at least it works for some ammo now. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6218 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
* Add a new command for firing without quivering on 'F'.j-p-e-g2008-06-271-1/+5
| | | | | | | Use puff of fire/ice tiles for ammo of flame/ice being fired. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6169 c06c8d41-db1a-0410-9941-cceddc491573
* Use one of dploog's suggested messages from the "gods should beckon you" dolorous2008-06-261-1/+3
| | | | | | | FR as Nemelex's greeting message. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6154 c06c8d41-db1a-0410-9941-cceddc491573
* Disallow quivering equipped items. (You can still (fi)re your wieldedj-p-e-g2008-06-261-5/+6
| | | | | | | | weapon if you insist, you just can't quiver it.) And another general clean-up. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6149 c06c8d41-db1a-0410-9941-cceddc491573
* Misc. minor cleanups. (Yes, a huge amount of them but still...)j-p-e-g2008-06-261-5/+5
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6146 c06c8d41-db1a-0410-9941-cceddc491573
* Fix compilation.dolorous2008-06-251-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6140 c06c8d41-db1a-0410-9941-cceddc491573
* Modify quiver to only quiver ammunition explicitly chosen by the playerj-p-e-g2008-06-241-1/+1
| | | | | | | | | | | | (via (,) or i, or by the new quivering command). Ammo that just happens to come next in the fire order is not quivered anymore even if you continue firing. Add a new quiver command on Q, and while I was at it, restrict the items offered when firing (fi) or quivering to actual throwables. (This was a long outstanding FR.) I think that's it... git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6112 c06c8d41-db1a-0410-9941-cceddc491573
* Move around some commands.j-p-e-g2008-06-241-7/+14
| | | | | | | | | | | Ctrl-Q (Tiles settings) -> Ctrl-V (was version, now ?V) Q (quit) -> Ctrl-Q ... which frees Q for a new command "set quiver", not yet implemented. I've updated some docs but may have overlooked something. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6110 c06c8d41-db1a-0410-9941-cceddc491573
* Move the prompt on entering a level that is marked as dangerous viaj-p-e-g2008-06-231-2/+10
| | | | | | | | annotation or exclusion *before* the delay is started, so it doesn't cost a turn. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6087 c06c8d41-db1a-0410-9941-cceddc491573
* Tweak Trog's Berserk description - he doesn't routinely preventj-p-e-g2008-06-231-2/+2
| | | | | | | followers from passing out, though the chance eventually reaches 100%. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6084 c06c8d41-db1a-0410-9941-cceddc491573
* Swap '.' and '!' in the targetting interface.j-p-e-g2008-06-221-12/+8
| | | | | | | | | | Forbid bats wearing hats/caps or rings. (That makes amulets the only type of equipment Vampires can keep on when transforming.) To make up for it, increase their damage stats again. Also fix it being possible to (un)equip the allowed items in Tiles while in bat form. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6055 c06c8d41-db1a-0410-9941-cceddc491573
* For jewellery with pluses and wands, only make an ident note when thezelgadis2008-06-191-6/+3
| | | | | | | | | | | | first item of the type is identified, not when the charges/pluses of any item of the type is identified. Make sure that artefacts have nothing to do with the identification level of jewellery by making versions of set_ident_type() and get_ident_type() which accept a full item_def as a parameter. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5973 c06c8d41-db1a-0410-9941-cceddc491573