summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/monstuff.cc
Commit message (Collapse)AuthorAgeFilesLines
* Merge r7836: divine summons should drop non-summoned items on death (FRzelgadis2008-12-161-1/+1
| | | | | | | | #2424917), summoned items should vanish when dropped/fired/thrown by monsters. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@7844 c06c8d41-db1a-0410-9941-cceddc491573
* Some more recent trunk commits -> 0.4.j-p-e-g2008-12-081-0/+1
| | | | | | | | | | | | 7429, 7672, 7716, 7729, 6646, 7760 * Descriptions, messages, help screen. Also: * Don't allow monsters to polymorph into uniques. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@7790 c06c8d41-db1a-0410-9941-cceddc491573
* Apply more commits into 0.4 branch, again mostly by Haran:j-p-e-g2008-12-081-7/+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
* Apply a bunch of trunk commits, mostly by Haran, namely:j-p-e-g2008-12-081-1/+8
| | | | | | | | | | | | | | | | | | 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
* Trunk->0.4 r6886: [2083243] Fixed crash when blinking monsters get killed by ↵dshaligram2008-09-061-1/+1
| | | | | | trap they land on. The fix no longer allows blinkers their zero-cost blink. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6887 c06c8d41-db1a-0410-9941-cceddc491573
* Apply trunk r6881 to 0.4.dolorous2008-09-061-3/+2
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6882 c06c8d41-db1a-0410-9941-cceddc491573
* Trunk->0.4 r6834 (partial): Tweak some checks for travel_path to be on the ↵dshaligram2008-08-221-7/+8
| | | | | | safe side. Probably fixes [2038910]. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6843 c06c8d41-db1a-0410-9941-cceddc491573
* Fix bug in shift_monster().haranp2008-07-291-13/+2
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6714 c06c8d41-db1a-0410-9941-cceddc491573
* Apply r6640, r6694 (both by Darshan), r6670 (Haran), r6679 and r6703j-p-e-g2008-07-281-1/+1
| | | | | | | | | | | (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-2/+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
* Applying r6609 to 0.4.ennewalker2008-07-191-8/+33
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6610 c06c8d41-db1a-0410-9941-cceddc491573
* Applying r6598 to 0.4.ennewalker2008-07-181-2/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6599 c06c8d41-db1a-0410-9941-cceddc491573
* Add minor cosmetic fixes.dolorous2008-07-071-2/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6441 c06c8d41-db1a-0410-9941-cceddc491573
* Another clean up, and add some new weapon speech.j-p-e-g2008-07-071-6/+6
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6439 c06c8d41-db1a-0410-9941-cceddc491573
* Fix 2011722: Reallow targetting beams such that you may be hit. (There'sj-p-e-g2008-07-061-1/+1
| | | | | | | | | | | | | a new prompt now, but don't prompt a second time if you already confirmed another one before.) Fix some issues when creating items in the Abyss during GDT_GAME_START. This may or may not have played a role in 2008976. Lower spawning rate in the Abyss during GDT_GAME_START (10% spawning chance instead of guaranteed spawning per 5 turns). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6434 c06c8d41-db1a-0410-9941-cceddc491573
* Fix 1945389: Detect Creatures not clearing monsters detected on changedj-p-e-g2008-07-061-10/+11
| | | | | | | terrain. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6419 c06c8d41-db1a-0410-9941-cceddc491573
* Fix 2011201: Disallow summoned orcs from joining a worshipper of Beogh.j-p-e-g2008-07-051-15/+16
| | | | | | | | 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
* Fix [2009377]: In _handle_behaviour(), initialize e_index to -1, so that dolorous2008-07-031-1/+1
| | | | | | | we don't try to access a nonexistent stored level exit. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6362 c06c8d41-db1a-0410-9941-cceddc491573
* Fix pacified monsters' leaving the level when the player gets far enough dolorous2008-07-031-1/+1
| | | | | | | away. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6361 c06c8d41-db1a-0410-9941-cceddc491573
* Mark unreachable areas for pacified monsters in the right place.dolorous2008-07-031-18/+14
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6360 c06c8d41-db1a-0410-9941-cceddc491573
* Simplify.dolorous2008-07-021-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6357 c06c8d41-db1a-0410-9941-cceddc491573
* And tweak it again.dolorous2008-07-021-3/+3
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6351 c06c8d41-db1a-0410-9941-cceddc491573
* Really fix pacified monsters' finding ways to blocked-off exits. As dolorous2008-07-021-2/+5
| | | | | | | | part of this, put the random wandering around the target back in for now. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6350 c06c8d41-db1a-0410-9941-cceddc491573
* And clean up the previous improvements.dolorous2008-07-021-13/+8
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6348 c06c8d41-db1a-0410-9941-cceddc491573
* Improve pacified monsters' routines for leaving the level again. Remove dolorous2008-07-021-21/+21
| | | | | | | | | | | death by submersion for now, since it's too specific to certain monsters, and leaving the level long enough will make them disappear anyway. Also, have monsters sometimes cycle through previously unreachable areas again, in case things change on the level to make them reachable. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6346 c06c8d41-db1a-0410-9941-cceddc491573
* Add more minor cosmetic fixes.dolorous2008-07-021-4/+4
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6345 c06c8d41-db1a-0410-9941-cceddc491573
* Pacified monsters leaving the level shouldn't go out of their way to dolorous2008-07-021-1/+2
| | | | | | | attack other monsters. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6344 c06c8d41-db1a-0410-9941-cceddc491573
* Actually handle cases of unreachable exits for pacified monsters leaving dolorous2008-07-021-19/+20
| | | | | | | the level. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6342 c06c8d41-db1a-0410-9941-cceddc491573
* Tweak numbers again.dolorous2008-07-021-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6340 c06c8d41-db1a-0410-9941-cceddc491573
* Let pacified monsters wander again, although less often than other dolorous2008-07-021-1/+1
| | | | | | | | monsters, in case the way to the exit is blocked and they need to find another way there. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6337 c06c8d41-db1a-0410-9941-cceddc491573
* Comment fixes.dolorous2008-07-021-6/+6
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6335 c06c8d41-db1a-0410-9941-cceddc491573
* Oops, don't let pets swap or be swapped with other monsters if thezelgadis2008-07-021-0/+8
| | | | | | | player explictly told them to attack monsters in spite of sanctuary. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6330 c06c8d41-db1a-0410-9941-cceddc491573
* Don't let the player swap places with stationary monsters.zelgadis2008-07-021-1/+66
| | | | | | | | 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
* Make berserking and non-living monsters stop retreating from Sanctuary aszelgadis2008-07-021-10/+8
| | | | | | | | | | | | soon as they leave it, since they're being forced out rather than actually afraid. Also give a "stops retreating" message for them instead of the "regaining courage" one. Remove faulty logic that was causing monsters to not notice the player as soon as they stopped fleeing Sanctuary. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6320 c06c8d41-db1a-0410-9941-cceddc491573
* When laying down Sanctuary make all pets inside it stop attacking and movezelgadis2008-07-021-6/+18
| | | | | | | | | | | | | | | | | | | towards you. You can get them to attack while inside Sanctuary by giving them an order to attack a specific monster, and if they do attack and violate Sanctuary then it will be removed. Attempting to give such an order will give a warning that it might violate Sanctuary. Prevent confused and berserking pets from violating Sanctuary, since you can't order them not to. Prevent monsters fleeing Sanctuary from attacking monsters which are blocking their flight path. The player attacking him/her-self because of confusion no longer vilates Sanctuary. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6312 c06c8d41-db1a-0410-9941-cceddc491573
* Per jpeg's suggestion, don't make pacified monsters wander around their dolorous2008-07-011-1/+1
| | | | | | | | target so often by ignoring the 1/20 chance of their doing so (unless the monster in question is batty). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6306 c06c8d41-db1a-0410-9941-cceddc491573
* Stationary monsters can't flee, even from sanctuary.zelgadis2008-07-011-0/+4
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6285 c06c8d41-db1a-0410-9941-cceddc491573
* Make sure pacified monsters don't use emergency spells that harm the dolorous2008-06-301-4/+12
| | | | | | | | area (i.e. torment). Spells that harm targets are still okay, since pacified monsters are also allowed to harm targets via melee. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6236 c06c8d41-db1a-0410-9941-cceddc491573
* Simplify again.dolorous2008-06-301-2/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6235 c06c8d41-db1a-0410-9941-cceddc491573
* Fix good random secondary choices during character selection.j-p-e-g2008-06-291-1/+2
| | | | | | | | 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
* Don't behold and and un-behold the player in the same instant if a mermaidzelgadis2008-06-291-1/+11
| | | | | | | | is behind a transparent wall, but instead give a message about being unable to hear the mermaid. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6215 c06c8d41-db1a-0410-9941-cceddc491573
* Force berserking and non-living monsters to flee sanctuary.zelgadis2008-06-291-4/+11
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6212 c06c8d41-db1a-0410-9941-cceddc491573
* Only place a newly created monster (summons) on a sanctuary square if itzelgadis2008-06-291-3/+6
| | | | | | | | | | | | | | | is friendly. Only allow friendly and neutral-good monsters to blink or teleport onto a sanctuary square. Don't allow corpses on sanctuary squares to be rotted or animated. Restrict monster cantrip messages to self-buff types if the player is in sanctuary. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6211 c06c8d41-db1a-0410-9941-cceddc491573
* Simplify.dolorous2008-06-291-6/+3
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6207 c06c8d41-db1a-0410-9941-cceddc491573
* Bug 2005002: Allow friendly and neutral-good monsters to cast spells while inzelgadis2008-06-291-14/+13
| | | | | | | | | sanctuary, and allow hostile and neutral monsters to cast spells once outside of sanctuary as long as it won't harm anything inside of sanctuary. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6205 c06c8d41-db1a-0410-9941-cceddc491573
* Comment fixes.dolorous2008-06-291-2/+3
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6200 c06c8d41-db1a-0410-9941-cceddc491573
* Fix calculation of how far away a pacified monster is from the player.dolorous2008-06-291-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6199 c06c8d41-db1a-0410-9941-cceddc491573
* Enable pacified monsters' traveling to teleportation traps again. They dolorous2008-06-291-4/+6
| | | | | | | | won't make monsters leave the level, but they may teleport them far enough away that they might leave anyway. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6198 c06c8d41-db1a-0410-9941-cceddc491573
* Add minor cosmetic fixes.dolorous2008-06-291-6/+6
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6197 c06c8d41-db1a-0410-9941-cceddc491573
* Display the proper message when a pacified monster leaves the level.dolorous2008-06-291-6/+8
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6196 c06c8d41-db1a-0410-9941-cceddc491573