summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/delay.cc
Commit message (Collapse)AuthorAgeFilesLines
* Allow autosacrifice on altars and when silenced (minmay)Neil Moore2014-08-031-1/+1
| | | | In the former case, without displaying the normal altar prompts.
* prompt for stasis in between swapping amulets too (8708)Jesse Luehrs2014-08-031-0/+23
|
* Remove stuffNicholas Feinberg2014-07-291-1/+1
| | | | | | | .cc, moving its contents into the new stepdown.cc and strings.cc. (The latter also got many donations from libutil.h.) Down with stuff! Up the new flesh!
* Create prompt.ccNicholas Feinberg2014-07-271-0/+1
|
* Let BLOOD finally have its place in the sunNicholas Feinberg2014-07-011-0/+1
| | | | | | ...by moving bloodspatter functions into their own file. Death to misc.cc! Long live the new file hierarchy!
* Split butchering/bottling into a new fileNicholas Feinberg2014-07-011-0/+1
|
* Rename 'mesclr()' to 'clear_messages()'reaverb2014-06-221-1/+1
|
* The great mon-stuff migration.Shmuale Mark2014-06-221-2/+2
| | | | | | | | | A good deal of functions move to the two new files, mon-poly and mon-message. Of the others, some go to where they are used, some to mon-util, and a few are made member methods of monster. This probably breaks Xcode compilation, and I'm not able to test the changes I made to MSVC that will (hopefully) keep it working.
* Add an option for more consistent prompt behaviour when changing jewelleryChris Campbell2014-06-101-1/+1
| | | | | | | When enabled, you will always be prompted to choose a hand/tentacle when equipping a ring, even if you currently have some empty slots, or if one ring is cursed, etc. As a result, "Px>" should always result in "put ring x on right hand", and never "put on ring x, then go downstairs", for example.
* Don't claim that monster open portal gates (#8655)Neil Moore2014-06-071-1/+1
| | | | | | SC_ARCH was added in 0.14-a0-2782-gadab473, but the places that should have used it used SC_GATE instead. And of course a gate is not the same as a gate.
* A popular 4.1ism: Titles for uniques.Steve Melenchuk2014-06-011-1/+3
| | | | | | | | | Boris, Master of Life and Death comes into view. Currently displays only on the describe screen and on the unique coming into view by itself. Special thanks to the team on ##crawl-dev that helped assemble these.
* Remove player burden and carrying capacitygammafunk2014-05-261-3/+3
| | | | | | | | | | | Item inventory weights (based on item mass) generally don't lead to meaningful decisions that justify the inventory juggling and interface problems that come from having burden states. The 52-slot limit is a better system for limiting inventory and providing inventory-related decisions because it's not so fine-grained and doesn't require the player to examine weights for each slot. Work is ongoing to improve the slot system by consolidating food types and handling strategic consumables in a different way.
* Chance function(void) to function()reaverb2014-05-241-2/+2
|
* Trigger shoutitis on seeing enemies, not randomly (dck).Steve Melenchuk2014-05-231-0/+6
| | | | This should make it more relevant.
* Gozag wrath: counter-bribe.Steve Melenchuk2014-05-071-0/+14
| | | | | When you spot monsters, Gozag can incite them against you, granting them one of a handful of beneficial effects.
* Give monster warnings their own channel.Steve Melenchuk2014-04-101-1/+1
| | | | | People who like setting force_mores on this can thus do so with one line for all possible variants on the message.
* Remove some more djinn code.Shmuale Mark2014-04-101-5/+1
| | | | | | | Nothing that changes functionality or that makes the interface looks too weird. In several of the instances the code would be weird after moving to TAG_MAJOR_VERSION 35, so it seems worth it to remove now rather than leaving it around.
* Make skill training restrictions depend on carried instead of equipped itemsChris Campbell2014-04-091-1/+0
| | | | | | For Shields in particular, carrying a shield is sufficient for training purposes. Remove a number of now-unnecessary checks, including some checks that were already obsolete for curses on wielded weapons.
* Remove scrambling.Shmuale Mark2014-04-061-2/+2
| | | | | | | It was something that was almost never relevant but that cluttered up the code regardless. If it were to be more relevant that would not really be a good thing since a chance for instadeath is rather bad design.
* Let Vampires continue bottling blood if reduced below level 6 mid-bottlingChris Campbell2014-03-271-7/+0
| | | | Since that should be impossible.
* Remove a reference to corpse sacrifice by butcheryChris Campbell2014-03-271-6/+2
| | | | Obsolete since 7d6de33069!
* Fix message for monsters coming down stairs (wheals).Steve Melenchuk2014-03-091-1/+1
|
* Octopode Crusher: An octopode warrior that throws your weight around.gammafunk2014-03-061-0/+2
| | | | | | | | | | | | | | | | | This a late-game octopode monster with a new throw ability as well as throw icicle. It's meant to be a bit tougher than the late-shoals merfolk it can spawn with in the Depths water population (it replaces ordinary octopodes there). New ability: Throw. A 2 in 5 chance to hurl a victim that's currently being constricted by the crusher for undodgable, AC-checking damage, preferably "into" (i.e. adjacent to) a solid feature for 50% increased damage. The base throw damage is currently HD * 3. The landing site must be at distance of at least 4 from the thrower, is always habitable for the victim, and the feature site must be visible to the thrower if the damage increase is to apply. If no landing site adjacent to a solid feature can be found, any habitable landing site in LOS is used, but then only the base damage applies.
* Zin warns the player of shapeshifters.Steve Melenchuk2014-03-031-5/+27
| | | | | Since you can use Recite to pick them out anyway, we might as well just straight up tell the player.
* Remove djinn.wheals2014-02-241-1/+5
| | | | | | | Djinn games can't be started (hopefully including using the rcfile), and djinn code should be removed on save-compat bump. Also, schedule a few SE things to be removed.
* Reduce spamminess on some types of monster generation.Steve Melenchuk2014-02-231-0/+39
| | | | | | Namely, only print one message when a monster is generated from another level or in the abyss; i.e. instead of "A kobold comes up the stairs. A kobold comes into view." you only get the former.
* Rename abl-show.{cc,h} to ability.{cc,h}Adam Borowski2013-12-241-1/+1
| | | | The old name was quite puzzling...
* Drop double newlines where they seem to serve no purpose.Adam Borowski2013-12-211-1/+0
| | | | | Sometimes, they're there to emphasize a break between two sections of code, which is good. In a majority of cases, though, they're just inconsistent.
* Simplify butchery handlingChris Campbell2013-12-061-86/+7
| | | | | | Butchery is always allowed except in a few forms (bat, wisp, fungus). Removes a lot of unnecessary/unused code for swapping weapons and removing equipment when butchering.
* Fix Djinnies getting some hunger related messsagesPekka Lampila2013-12-031-1/+1
|
* Replace `mpr(s, ch)` with `mprf(ch, s)`Adam Borowski2013-11-291-16/+15
| | | | | | | | | Also simplify quite a few cases. It turns out in >90% cases of non-literals the argument had .c_str(), which meant it was pointlessly malloc()ed and converted from and to std::string. I believe a sprintf is faster, so even the argument of miniscule speed-up doesn't apply.
* Revert "Replace `mprf(ch, s)` with `mpr(s, ch)`"Adam Borowski2013-11-291-3/+3
| | | | | | | | It trades readability and consistency for an utterly negligible bit of speed. With the amount of further processing mpr() does, a single sprintf is nothing. This reverts commit d9dfa8fc9755fb0a4e8954c7eb94f32fe97b82e0.
* Replace `mprf(ch, s)` with `mpr(s, ch)`Chris Oelmueller2013-11-281-3/+3
| | | | Scripted, then manually reviewed.
* Replace `mprf(s)` with `mpr(s)`Chris Oelmueller2013-11-281-2/+2
| | | | Scripted, then manually reviewed.
* More formatting fixes for return (...);Neil Moore2013-11-151-2/+2
|
* Drop unnecessary parentheses from return statements.Adam Borowski2013-11-151-14/+14
|
* Merge branch 'dwants'. Bring some Raid.Adam Borowski2013-11-061-1/+23
|\
| * Merge branch 'master' into dwantsAdam Borowski2013-11-011-1/+1
| |\
| * | Assorted formatting fixes.Adam Borowski2013-11-011-5/+2
| | |
| * | Merge branch 'master' into dwantspubby2013-10-011-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: crawl-ref/source/dat/des/variable/mini_monsters.des crawl-ref/source/enum.h crawl-ref/source/itemprop.cc crawl-ref/source/main.cc crawl-ref/source/mutation-data.h crawl-ref/source/mutation.cc crawl-ref/source/newgame.cc crawl-ref/source/ng-restr.cc crawl-ref/source/rltiles/dc-player.txt crawl-ref/source/spl-selfench.cc crawl-ref/source/throw.cc crawl-ref/source/tilepick-p.cc crawl-ref/source/wiz-you.cc
| * \ \ Merge branch 'master' into dwantspubby2013-08-311-106/+10
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: crawl-ref/docs/crawl_manual.reST crawl-ref/source/abl-show.cc crawl-ref/source/dat/descript/ability.txt crawl-ref/source/delay.cc crawl-ref/source/enum.h crawl-ref/source/main.cc crawl-ref/source/mon-cast.cc crawl-ref/source/mon-gear.cc crawl-ref/source/mon-spll.h crawl-ref/source/mutation-data.h crawl-ref/source/mutation.cc crawl-ref/source/ng-restr.cc crawl-ref/source/ng-setup.cc crawl-ref/source/output.cc crawl-ref/source/player-act.cc crawl-ref/source/player.cc crawl-ref/source/species.cc crawl-ref/source/spl-data.h crawl-ref/source/wiz-you.cc
| * | | | Fix whitespace.Neil Moore2013-08-281-1/+1
| | | | |
| * | | | Create Formicid species and monsters.pubby2013-08-251-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tavern post: https://crawl.develz.org/tavern/viewtopic.php?f=8&t=8298 Wierdness & mutations: - poison weakness - retractable antennae (can wear headgear and ignore mutation) - chitin skin (+3 AC) - most weapons 1-handed, big weapons 2-handed - permanent stasis - ability to shaft self - ability to dig - Starts with 2 curing pots 3 monster versions of formicids were added: formicid, a weak fighter formicid drone, a stronger fighter formicid venom mage, a magician with olgreb's and mass cure poison [ Pushing to a branch for experimental playtesting on CSZO. Also optimised the new tiles. -nfm ]
* | | | | Axe a buttload of useless #includes.Adam Borowski2013-11-031-3/+0
| |_|_|/ |/| | | | | | | | | | | | | | | Can't test Android, MSVC or Mac, but a very brief glance at the diff suggests it's unlikely they're affected.
* | | | Rebase hunger values at 0 (from 100).Adam Borowski2013-10-271-1/+1
| |_|/ |/| | | | | | | | | | | | | | | | | | | | Also, get rid of a number (but not all) literal values, replacing them with defines. No compensation is given for proportional costs (Zin's wrath, hungry ghost melee).
* | | Merge branch 'next'Adam Borowski2013-09-251-1/+1
| |/ |/|
* | Avoid some unused-static warnings with NO_LUA_BINDINGS.Neil Moore2013-07-291-1/+3
| | | | | | | | | | | | Using UNUSED() rather than #ifdef'ing out their definitions, because the latter is somewhat more fragile if someone does make them not-unused.
* | Refactor 'you.religion' checks.Brendan Hickey2013-07-281-1/+1
| | | | | | | | | | Pull 'you.religion [!=]= FOO' checks into a function: you_worship(FOO). This change is part of a large plan to clean up religion.
* | Remove a crapload of references to removed things.Adam Borowski2013-07-171-1/+5
| | | | | | | | The Dwarf branch, traps skill, recite, even a spiked flail sighting.
* | Turn Recite into a duration instead of a delay.Steve Melenchuk2013-07-161-102/+0
| | | | | | | | | | | | | | | | It triggers three times over 30 aut, just as the current implementation does, only the player can otherwise act during that time. Reading a scroll or casting a spell interrupts the recitation - you can't pronounce two things at once, after all.