summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/output.cc
Commit message (Collapse)AuthorAgeFilesLines
* Apply my latest commits to 0.4.j-p-e-g2008-07-131-7/+12
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6531 c06c8d41-db1a-0410-9941-cceddc491573
* Add lm_props.lua and appry recent commits.j-p-e-g2008-07-111-25/+31
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6494 c06c8d41-db1a-0410-9941-cceddc491573
* Apply recent commits to 0.4, including Matthew's evil zoo fix.j-p-e-g2008-07-091-3/+20
| | | | | | | 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
* Fix 1870427: Max hp misreported if frail and rotted.j-p-e-g2008-07-061-5/+5
| | | | | | | | | | Fix 2002931: feature_item_brand not working No, it's not the important bugs, but at least these are bugs I can reproduce. :P git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6433 c06c8d41-db1a-0410-9941-cceddc491573
* Fix 2011201: Disallow summoned orcs from joining a worshipper of Beogh.j-p-e-g2008-07-051-1/+6
| | | | | | | | 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
* Add spelling fixes where possible: "gray" -> "grey".dolorous2008-07-041-7/+7
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6381 c06c8d41-db1a-0410-9941-cceddc491573
* Fix 1999363: Vampire eating issues.j-p-e-g2008-07-031-7/+9
| | | | | | | | | Tidy up the new lines item descriptions a bit, so you don't get three free lines in some cases (non-randart, non-special description items) and one or two in other cases. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6370 c06c8d41-db1a-0410-9941-cceddc491573
* When displaying player skills, clear to the ends of both lines, so that dolorous2008-06-301-0/+2
| | | | | | | | e.g. switching from Lugonu to Xom doesn't leave "the Foo of Xomonu" on the screen. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6254 c06c8d41-db1a-0410-9941-cceddc491573
* Misc. minor cleanups. (Yes, a huge amount of them but still...)j-p-e-g2008-06-261-2/+2
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6146 c06c8d41-db1a-0410-9941-cceddc491573
* For functions that return char*'s, don't return a c_str() of an dolorous2008-06-251-8/+9
| | | | | | | | | | | | | | | 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
* Improve targetting via monster list, add a new option to define thej-p-e-g2008-06-251-3/+8
| | | | | | | toggle's initial setting, and update/correct the documentation a bit. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6135 c06c8d41-db1a-0410-9941-cceddc491573
* Apply patch 1952761 by jarpian (wasp): targetting with the monster list.j-p-e-g2008-06-241-59/+61
| | | | | | | | | | | | | | I've updated the patch to the current mlist code, but there are still a couple of bugs that will need to be ironed out. For example, monsters are picked by comparing their attitude and type, which is not sufficient in the case of (non-collapsed) zombies, as well as mimics or ghosts. Also if the number of monsters in the visible list is greater than its rows (because some appear in the same row) then monsters outside of the visible list can be targetted. I guess this is an unintended feature. :) I'm certain there'll be more bugs, though. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6129 c06c8d41-db1a-0410-9941-cceddc491573
* Modify quiver to only quiver ammunition explicitly chosen by the playerj-p-e-g2008-06-241-19/+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
* Change quiver output to that of the next item actually fired. Currentlyj-p-e-g2008-06-241-16/+28
| | | | | | | updates correctly on firing and dropping quivered items. May be buggy. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6107 c06c8d41-db1a-0410-9941-cceddc491573
* Finally remove the code that was preventing the coloured bars fromj-p-e-g2008-06-231-15/+6
| | | | | | | | | updating while resting in Tiles. With the overhaul of the drawing routines (already one or two months old) it's not needed anymore, and I really should have reacted to the new circumstances sooner. :P git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6088 c06c8d41-db1a-0410-9941-cceddc491573
* Update tutorial information for the 'm' and 'a' screens.j-p-e-g2008-06-191-6/+16
| | | | | | | | | Space allowing, differentiate between hydras with different numbers of heads in the monster list. (This is probably only interesting in the Swamp.) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5993 c06c8d41-db1a-0410-9941-cceddc491573
* Extend the monster list merge handling to dancing weapons and mimics.j-p-e-g2008-06-191-3/+19
| | | | | | | | | Player ghosts should never be merged (rare as that case may be), but I can't test it because in wizard mode all ghosts are named "John Doe", so they always automerge on account of having the same name. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5978 c06c8d41-db1a-0410-9941-cceddc491573
* Fix 1996837: Allow equipping spellcasters with ammunition on generation.j-p-e-g2008-06-191-24/+41
| | | | | | | Fix 1997179: Merge zombies correctly in the monster list. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5977 c06c8d41-db1a-0410-9941-cceddc491573
* Fix most of 1995487:haranp2008-06-181-1/+1
| | | | | | | | - hack description for Trog bookburning ability - fix typo in Trog description git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5963 c06c8d41-db1a-0410-9941-cceddc491573
* Comment fixes.dolorous2008-06-151-2/+2
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5858 c06c8d41-db1a-0410-9941-cceddc491573
* In the "%" screen, always display the shield class number. even when no dolorous2008-06-151-9/+3
| | | | | | | | | physical shield is equipped. This is so that, if the only shield available is magical, the player can see the shield class, just as in the HUD. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5857 c06c8d41-db1a-0410-9941-cceddc491573
* Fix 1948131: Quiver slot name wraps around the screen.j-p-e-g2008-06-151-3/+4
| | | | | | | | Also fixes tile issues where the inventory was partly covered or not shown at all. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5844 c06c8d41-db1a-0410-9941-cceddc491573
* Remove unneeded methods (including the old resistance screen), renamej-p-e-g2008-06-121-271/+0
| | | | | | | debugging functions, and some other clean-up. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5757 c06c8d41-db1a-0410-9941-cceddc491573
* Yikes, so many files! And all I did was add more item evaluationj-p-e-g2008-06-091-3/+5
| | | | | | | | | | | | | | | | | | | | | | | functions for menu colouring and pickup... Added: emergency_item, good_item, dangerous_item, bad_item, and useless_item, all taking into account player species and mutations, so e.g. =see invisible is useless for Naga, and !poison is always bad but only useless if you don't know Evaporate. Never autopickup useless, dangerous (e.g. ?immolation) or inedible items, and simplify the item colour/pickup options accordingly. I'll have to see if pickup.lua is still even needed after this. Removed the menu_colour_prefix_id option as I can't see any reason to turn it off. Oh, and fixed a bug where Kenku were unable to stop levitating if they gained level 15 while levitating. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5658 c06c8d41-db1a-0410-9941-cceddc491573
* After some thinking remove the bat form exception for starving Vampiresj-p-e-g2008-06-091-2/+1
| | | | | | | | not regenerating. Also add some more information to the Vampire mutation toggle. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5651 c06c8d41-db1a-0410-9941-cceddc491573
* Fixed problem with monsters on edge of vision not being listed. Mightzelgadis2008-06-091-4/+4
| | | | | | | be bug 1946671. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5625 c06c8d41-db1a-0410-9941-cceddc491573
* FR 1971056: In the monster pane list use a monster's full name, like "ratzelgadis2008-06-091-7/+35
| | | | | | | | | | zombie", unless there's too many monsters to fit into the pane, in which case revert to using a monster's type name ("small zombie") so that different monsters of the same type will be shown on the same line ("2 rat zombies" + "3 kobold zombies" becomes "5 small zombies"). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5622 c06c8d41-db1a-0410-9941-cceddc491573
* Fix BR 1986191: Stealth output for @ still used the old thresholds anddploog2008-06-061-9/+11
| | | | | | | | adjectives. Ideally, we would only have one list instead of two. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5498 c06c8d41-db1a-0410-9941-cceddc491573
* Commit a few changes, mostly clean-up.j-p-e-g2008-06-011-2/+2
| | | | | | | | | | | | | * Modify tile_show_items setting in tutorial to (hopefully) show corpses again. * Change skill_exp_needed to use the level input rather than decreasing the passed in parameter, esp. when it was mostly called in the form skill_exp_needed(x + 1) anyway. I was trying to find out what went wrong in BR 1929156 but I can't work out the formula. :( git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5421 c06c8d41-db1a-0410-9941-cceddc491573
* Add const.dolorous2008-06-011-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5393 c06c8d41-db1a-0410-9941-cceddc491573
* Fix 1962147: Move the comments on the food you eat at the end of DELAY_EAT.j-p-e-g2008-05-311-12/+4
| | | | | | | | | | | | | | | | Fix 1971216: Kills by confused undead use LIVING_KILLED_BY_SERVANT instead because the message ("collateral kill") fits better and, though it's basically a hack, the distinction does fit somehow. Fix 1914948: Tweak message when you resist a spell cast by an invisible monster. Fix 1946608: Print "Nothing appears to happen." if reading ?EWI when unarmed. I guess that's it, plus probably some more cleanup. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5378 c06c8d41-db1a-0410-9941-cceddc491573
* Consolidate all cases where corpses are turned into skeletons, asj-p-e-g2008-05-311-4/+9
| | | | | | | | | | | | | | | | | | suggested by dolorous in BR 1977925, and turn coloured draconian corpses into plain draconian skeletons. Same when the game attempts to create coloured draconian skeletons or simulacrums. Added autoinscription to the single inscription command ('{') - this is necessary for items with long descriptions that can't autoinscribed otherwise. Added a small hack to make death cobs (%) appear correctly in the monster list. The rest is cleanup, I believe. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5376 c06c8d41-db1a-0410-9941-cceddc491573
* Changed hud (and % screen) a bit: Write EV and SH instead of Ev and Sh.dploog2008-05-301-32/+33
| | | | | | | | Change order from AC/Sh/Ev to AC/EV/SH. Also put AC/EV/SH to the left and Str/Int/Dex to the right. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5342 c06c8d41-db1a-0410-9941-cceddc491573
* Fix 1914059: randart jewellery inconsistently described as {tried} byj-p-e-g2008-05-251-8/+10
| | | | | | | | | | adding yet another entry to props. FR 1949504: Move version information into the help scroller, yay! It also looks much nicer now (if I may say so). Go, take a look! :) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5234 c06c8d41-db1a-0410-9941-cceddc491573
* Experimentally dump the new overview screen rather than the old one.j-p-e-g2008-05-241-41/+98
| | | | | | | | | | | | | | | | | I'm actually not entirely convinced this is the way to go. a) The new one is more informative, but the dump already contains all that extra information in a much more detail. b) The new one is much more concise, but that's something that's not necessary in the dump. On the plus side, new players doesn't have to get used to two different designs. Anyway, the old dump is still there, and we could use the dump options to let the player choose which one to use. For now, let's try whether it's possible to get used to this one. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5225 c06c8d41-db1a-0410-9941-cceddc491573
* Move the mpr version of the monster list to output.cc and add it toj-p-e-g2008-05-241-20/+185
| | | | | | | | | | | | | | | | | the dumped information in the morgue. Change monster naming to the precise listing of zombie sub types etc. but list monster types in brackets for non-unique named monsters, so you can now find information like the following in your morgue file: "You can see a goblin, an orc, two orc warriors, thirteen friendly orcs, and the friendly Bogrim (orc priest)." Since the concise version of the monster list is still an in-game command ('F'), this also neatly solves the problem of orc players not knowing the type of their followers. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5223 c06c8d41-db1a-0410-9941-cceddc491573
* Change SP_GOLDEN_DRACONIAN to SP_YELLOW_DRACONIAN, for consistency.dolorous2008-05-241-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5215 c06c8d41-db1a-0410-9941-cceddc491573
* Add various attitude- and alignment-related fixes.dolorous2008-05-201-4/+0
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5156 c06c8d41-db1a-0410-9941-cceddc491573
* Add more minor cosmetic fixes.dolorous2008-05-201-1/+2
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5153 c06c8d41-db1a-0410-9941-cceddc491573
* Fix [1967456]: Change "horribly wounded" to "severely wounded".dolorous2008-05-191-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5143 c06c8d41-db1a-0410-9941-cceddc491573
* Fix [1962231]: The zombie damage indicator in the monster list no longer dolorous2008-05-181-1/+5
| | | | | | | displays wound information, just as examining them with 'x' doesn't. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5124 c06c8d41-db1a-0410-9941-cceddc491573
* Fix indentation.dolorous2008-05-181-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5123 c06c8d41-db1a-0410-9941-cceddc491573
* Comment fixes.dolorous2008-05-151-2/+2
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5064 c06c8d41-db1a-0410-9941-cceddc491573
* Display divine stamina in the "@" and "%" screens, under "divine dolorous2008-05-151-0/+3
| | | | | | | fortification". git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5063 c06c8d41-db1a-0410-9941-cceddc491573
* Comment fix.dolorous2008-05-151-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5058 c06c8d41-db1a-0410-9941-cceddc491573
* Display divine robustness in the "@" and "%" screens.dolorous2008-05-151-0/+4
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5057 c06c8d41-db1a-0410-9941-cceddc491573
* Add divine stamina (temporary stat-boosting) to Zin's Revitalisation.dolorous2008-05-151-3/+15
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5054 c06c8d41-db1a-0410-9941-cceddc491573
* Add more TSO halo description fixes.dolorous2008-05-101-2/+2
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4979 c06c8d41-db1a-0410-9941-cceddc491573
* Remove "Halo" from the stats screen.dolorous2008-05-091-10/+5
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4969 c06c8d41-db1a-0410-9941-cceddc491573
* [1960394] Fixed crash when examining items from %. (Menu objects own their ↵ennewalker2008-05-091-5/+6
| | | | | | MenuEntry objects, so you can't destroy a Menu and then pass around MenuEntry pointers.) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4960 c06c8d41-db1a-0410-9941-cceddc491573