summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/monspeak.cc
Commit message (Collapse)AuthorAgeFilesLines
* Misc. minor cleanups. (Yes, a huge amount of them but still...)j-p-e-g2008-06-261-13/+13
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6146 c06c8d41-db1a-0410-9941-cceddc491573
* Add still more cleanups.dolorous2008-06-161-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5895 c06c8d41-db1a-0410-9941-cceddc491573
* Fix 1937489: Remove map markers overwritten by lakes or rivers, as wasj-p-e-g2008-06-011-1/+1
| | | | | | | | | | | | | already done for vaults. Modify monster speech to make the beast only use some selected shouts (i.e. not "You hear an irritating whine") and NEVER do the demon taunts since it cannot speak. Demon lords can use almost the whole array of speaking verbs except for "buzz" and "whine". git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5400 c06c8d41-db1a-0410-9941-cceddc491573
* Add still more minor cosmetic fixes.dolorous2008-06-011-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5384 c06c8d41-db1a-0410-9941-cceddc491573
* Add two new channels, MSGCH_FRIEND_SPELL and MSGCH_FRIEND_ENCHANT,j-p-e-g2008-04-291-5/+15
| | | | | | | | | | | | | | | | | | whose sole purpose is to not interrupt resting if it's a friend doing the spellcasting or enchanting. Unspam the message handling for orcs going in a battle frenzy, and allow the message back into normal game. Fix 1953632: Named monsters' names are shown for unseen invisible monsters. Change general monster name handling to refer to friendly monsters as "your monster" rather than "the monster", like was already the case for monster speech. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4769 c06c8d41-db1a-0410-9941-cceddc491573
* Apply Horst von Brand's (first) patch 1887488: gcc-4.3 compile failures.j-p-e-g2008-04-141-11/+12
| | | | | | | I'm not sure what to do about the rest of that tracker item. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4233 c06c8d41-db1a-0410-9941-cceddc491573
* Code cleanup and renaming of static methods, mostly for decks.cc and j-p-e-g2008-03-311-31/+36
| | | | | | | dungeon.cc. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3984 c06c8d41-db1a-0410-9941-cceddc491573
* Another few modifications to monster speech, and removed (or rather,j-p-e-g2008-03-131-9/+21
| | | | | | | | | | | commented out, for now) the dependency of the W/T, P/R merge of easy_unequip (I'd completely mixed up the options.) If we decide we keep this behaviour and don't add a replacement option, the commented out "You're already wearing that." messages can be removed. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3619 c06c8d41-db1a-0410-9941-cceddc491573
* Fix new firing interface to also apply when selecting items via tile inventory.j-p-e-g2008-03-121-8/+11
| | | | | | | | | | | | | | | | | | | | | (This will also change the quiver, so that tile players no longer need to repeatedly choose the same stack of darts to fire: ff will work nicely.) Implement first part of FR 1911866: merging W/T, R/P The existing option "easy_unequip" now also allows direct choice of which armour to take off from the 'W' menu, and same for jewellery for 'P'. Warning inscriptions are respected. Now we only need to add a new sorting option sort_equipped that takes care of equipped stuff being listed first in the inventory. Last time I tried something like this (chunk sorting by age) I failed miserably, so I'm making no promises. Also tweak my recent {tried} modification to only apply to jewellery since for some reasons all unidentified randart weapons show {tried} where jewellery is really picky about which randarts have been tried and which haven't. Probably still needs fixing. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3607 c06c8d41-db1a-0410-9941-cceddc491573
* Another of those commits on monster speech, hopefully the last one forj-p-e-g2008-03-111-58/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | some time, though. I added a new prefix "related" if the player character has the same genus as the monster. My new prefix additions (hostile, related and religion) can now be skipped in the speech lookup, which fixes a couple of problems where several monsters were forced silent because of lookup problems. Also clean up the lookup process for silence, allow charmed monsters to sometimes speak (if rarely) and added several debugging statements that are also mentioned in monster_speech.txt that is now clearer than ever before (I hope). Fixed a couple of bugs in the monster shape calculation where the old glyphs were still being used. Also, a Draconian character eating any type of Draconian will now count as cannibalism. Also: FR 1894060: Level annotations now prompt for confirmation if they contain an exclamation mark (rather than "WARN"). Fix 1859443: Arriving on a square via staircase now calls request_autopickup and will describe items on the square. Oh, and fix init.txt to really allow reading in macros from external files. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3604 c06c8d41-db1a-0410-9941-cceddc491573
* Some more monster speech additions:j-p-e-g2008-03-111-10/+25
| | | | | | | | | | | | | | | | * allow handling of specifically neutral or hostile monsters * use "good god" or "evil god" prefix where applicable * add speech for friendly/neutral holy beings in combination with good god followers And... rewrote large portions of monster_speech.txt. I think I may now finally have understood how this works, so in the not so distant I will have have to clean up some of the hopelessly complicated functions I introduced when I only _thought_ I'd grasped the details. As usual, explaining it to someone else (if only in writing the documentation) really helped. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3591 c06c8d41-db1a-0410-9941-cceddc491573
* Add more orc speech, courtesy of David.j-p-e-g2008-03-101-0/+2
| | | | | | | | | | | Add "neutral" prefix for speech lookup, currently unused. (One of these days I'll need to update monster_speech.txt *yet again*.) Also: tweak modification scroll prompt to "Use on which item?" as suggested by Eino in BR 1910782. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3579 c06c8d41-db1a-0410-9941-cceddc491573
* FR 1833480: Implement Lemuel's Beogh specific orc speech.j-p-e-g2008-03-091-11/+22
| | | | | | | | | Orcs can now give different speech, depending on whether you worship Beogh or not, and of whether they are hostile or friendly. (Neutrals are treated as hostile, in this case.) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3547 c06c8d41-db1a-0410-9941-cceddc491573
* Fix 1905715: Print "nothing appears to happen" when zapping /diggingj-p-e-g2008-03-031-1/+1
| | | | | | | | | without effect, same as for enchantment wands. Fix 1905740: Only list actual spellbooks for memorise prompt. Also: s/memorize/memorise git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3508 c06c8d41-db1a-0410-9941-cceddc491573
* Make Options.race and Options.class translate correctly, no matter whether j-p-e-g2008-03-021-0/+1
| | | | | | | | | | | | the old or new species/classes order is used. Entails some more unborking of newgame.cc. Also: make Esc leave the species selection screen (synonym for 'X', quit the game), and use it to jump back to species selection from all other selection possibilities (class, book, weapon, god) as a synonym for Bksp. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3505 c06c8d41-db1a-0410-9941-cceddc491573
* Apply Paul's patch 1901892: reorganize/rewrite docs/monster_speech.txtj-p-e-g2008-02-261-1/+0
| | | | | | | | | | | And, while on the topic, of monster speech: * move weapon noises to a file of its own: noise.txt * finally outsource imp/demon insults (making insult.cc/h superfluous) This also activates the hitherto commented-out special racial insults pertaining to player species. As usual, more input welcome. :) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3465 c06c8d41-db1a-0410-9941-cceddc491573
* Monsters get multilevel resists (incomplete). Monster data needs to bedshaligram2008-01-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | adjusted per monster to hand out the right resists. The current MR_RES_FIRE gives one level of resistance only. Added a real ghost structure, discarded the old ghost values array. Adjusted bones file format so bones will work out-of-the-box with Hearse. Breaks bones format, older bones will be rejected. Fixed some maps with bad DEPTHs. Added more safe answers in Y/N prompts, added a check to make it less likely that Crawl will spin in a tight loop reading input from a closed tty. (Experimental) !a will override existing foe of friendlies in LOS. Blademasters no longer pick up stuff to throw (Erik). Zombies of swimming things are also swimming things. Currently applies only to zombies explicitly placed in .des files, since fish zombies cannot be generated otherwise (can of worms). Morgue is now saved before showing the inventory and other boring end-of-game stuff. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3231 c06c8d41-db1a-0410-9941-cceddc491573
* Yet another change to monster speech and silencing...j-p-e-g2007-09-161-25/+54
| | | | | | | | | | | | | | | | | | | | I found my previous change to block all messages passed through MSGCH_TALK when silenced was too restrictive, so I've added another channel MSGCH_TALK_VISUAL and adapted the monster speech files accordingly. For example, imps can now also "talk" when silenced, but only the visual stuff will actually be output. (This automatically takes care of lowering the output likelihood.) And no, this doesn't hurt any, as visual talk also won't interrupt travel or resting. And I added a how-to file on monster speech, which was the main reason for my silence during the last couple of hours. It's not that the database system is that complicated but it surely can't hurt to give players who want to add something an idea of what is possible and how to go about it. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2108 c06c8d41-db1a-0410-9941-cceddc491573
* Split off portions of externs.h and enum.h into other files. Thezelgadis2007-09-151-0/+1
| | | | | | | | | | | | | crawl_environment, player and monsters classes have been left in externs.h, which necessitates that all of the enums references by those classes stay in enums.h, since you can't forward declare an enum. However, it's a start. Also, portions of misc.{cc,h} have been split off into traps.{cc,h}, place.{cc,h} and terrain.{cc,h} git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2095 c06c8d41-db1a-0410-9941-cceddc491573
* Implementing patch 1775415 (outsourcing monster speech) byj-p-e-g2007-09-041-2511/+272
| | | | | | | | | | | zelgadis. Currently, shout.txt and speak.txt share in with the .des files in /dat. That should be changed, but I've no idea how to do this. Also implementing a bug fix by ennewalker (1787428). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2052 c06c8d41-db1a-0410-9941-cceddc491573
* Implementing patch 1772497 (improvement to runrest.lua byj-p-e-g2007-09-031-1/+1
| | | | | | | | | zelgadis). Also added notes for getting penance, and small fix (patch 1786893 by dolorous). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2047 c06c8d41-db1a-0410-9941-cceddc491573
* s/CAUGHT/HELD/j-p-e-g2007-08-221-1/+1
| | | | | | | Gladiators now start with 4 nets. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2026 c06c8d41-db1a-0410-9941-cceddc491573
* Added throwing nets. These still need work, and thusj-p-e-g2007-08-201-1/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | are not for 0.3. Obviously. Summary: New item type MI_THROWING_NET. The enchantment of a net describes its state, i.e. whether it's brand-new or almost falling apart (happens at -8). New attribute ATTR_CAUGHT (for monsters ENCH_CAUGHT) that means the victim cannot move and instead struggles against the net until it manages to wriggle out of it (takes a while depending on size) or it is destroyed. Monsters can still use items and spells when trapped. New trap type TRAP_NET that currently is the only source of throwing nets, though Gladiators (and some types of hunters maybe?) should start with a few, and David suggested also allowing the creation of nets for shops. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2020 c06c8d41-db1a-0410-9941-cceddc491573
* Fix another wording problem (dolorous)haranp2007-07-251-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1929 c06c8d41-db1a-0410-9941-cceddc491573
* More spoken monster lines (lemuel - 1748862)haranp2007-07-231-66/+165
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1921 c06c8d41-db1a-0410-9941-cceddc491573
* Corona overrides invisibility. To check if something is *really* invisible, usedshaligram2007-07-151-1/+1
| | | | | | foo.invisible(), not foo.has_ench(ENCH_INVIS) or foo.duration[DUR_INVIS]. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1874 c06c8d41-db1a-0410-9941-cceddc491573
* Removed all uses of str_monam() outside of mon-util.cc; str_monam() isharanp2007-07-071-1/+1
| | | | | | | | | now static. Some description fixes (mainly for mummies and nagas.) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1782 c06c8d41-db1a-0410-9941-cceddc491573
* monam(), moname() and ptr_monam() are gone.haranp2007-05-191-24/+26
| | | | | | | | | | The replacement is str_monam() and mons_type_name(). str_monam() should probably be folded into actor::name. I think. Deaths from zombies, skeletons and simulacra will not handle the name correctly; needs a further hack. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1484 c06c8d41-db1a-0410-9941-cceddc491573
* Moth of wrath angering attack was lost in 0.2, reintroduced.dshaligram2007-04-071-0/+4
| | | | | | | | | | Monsters can now go berserk (the rage spell, or by moth of wrath attack). Rupert is now a crusading-style berserker. Moths of wrath can now enrage nearby monsters of similar attitude. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1256 c06c8d41-db1a-0410-9941-cceddc491573
* Monster dialogue grammar fixes (Jordan).dshaligram2007-04-021-25/+25
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1183 c06c8d41-db1a-0410-9941-cceddc491573
* Dialogue for Murray contributed by Jordan Lewis.dshaligram2007-04-011-4/+114
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1172 c06c8d41-db1a-0410-9941-cceddc491573
* Grammar fixes (paxed).dshaligram2007-04-011-3/+3
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1171 c06c8d41-db1a-0410-9941-cceddc491573
* s/Adolf/Frederickharanp2007-03-241-6/+6
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1089 c06c8d41-db1a-0410-9941-cceddc491573
* Cleaned up monster enchantments. Instead of the old enum abuse (ENCH_ABJ_I, II,dshaligram2007-03-211-4/+4
| | | | | | | | | | | | | | | | | | | | etc.), enchantment is stored as a struct (ENCH_which, degree, whose_enchantment). This allows us to do such things as award experience for monsters poisoned by friends, or confused monsters bashing themselves or falling into lava (not implemented, but could be :-)). Doing monster_die() correctly is a little tricky for friendly-enchantment-deaths because the original monster may not be around to answer questions, so we fake the killer's stats for indirect friendly kills (which means that some gods may not award piety for minion-cast enchantments, f'r'instance). I think we can live with that for now. Breaks save file compatibility as usual. Clouds could also use similar treatment - poison clouds created by a friendly are not correctly tracked yet. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1075 c06c8d41-db1a-0410-9941-cceddc491573
* Kill unnecessary quote.dshaligram2007-03-031-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@975 c06c8d41-db1a-0410-9941-cceddc491573
* Clean up imp messages.dshaligram2007-02-251-4/+4
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@966 c06c8d41-db1a-0410-9941-cceddc491573
* Merged stone_soup r15:451 into trunk.dshaligram2006-11-221-5/+7
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@452 c06c8d41-db1a-0410-9941-cceddc491573
* Clean up a mistake in the SVN import.nlanza2006-08-131-0/+2325
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10 c06c8d41-db1a-0410-9941-cceddc491573