summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spells3.cc
Commit message (Collapse)AuthorAgeFilesLines
...
* Split map knowledge and FPROPs.Robert Vollmert2009-11-081-6/+7
| | | | | | | | map_cell no longer has the field "properties", which has been replaced by the unsigned long array env.pgrid. env.map has been renamed to env.map_knowledge. It should really be moved into player.
* Add a general halo interface to actor.Robert Vollmert2009-11-081-19/+0
| | | | | Also convert the TSO halo to use this. actor::haloed() is still specific to the player TSO halo.
* Remove player.h dependency from coordit.h.Robert Vollmert2009-11-081-1/+1
| | | | | | | | | adjacent_iterator had a default center of you.pos(), which is now gone (also the uses of). I was running into circular header dependencies with actor.h including los_def.h including coordit.h including player.h including actor.h.
* Rename purple smoke to clouds of translocational energyStefan O'Rear2009-11-061-2/+2
|
* Replace global see_cell by observe_cell and disambiguate old uses.Robert Vollmert2009-11-061-11/+11
| | | | | | | Calls to plain see_cell(pos) were replaced with either observe_cell(pos) or you.see_cell(pos). observe_cell where related to drawing the interface and messaging, you.see_cell for game mechanics, and one or the other in less clear cases (targetting, say).
* Move mons_is_friendly to monsters::friendly.Vsevolod Kozlov2009-11-061-2/+2
| | | | Signed-off-by: Robert Vollmert <rvollmert@gmx.net>
* Rename is_valid_item to item_def::is_valid.Vsevolod Kozlov2009-11-061-1/+1
| | | | Signed-off-by: Jude Brown <bookofjude@users.sourceforge.net>
* Unify mesmerisation code.Robert Vollmert2009-11-051-41/+9
| | | | | | | | There were several places that had copies of the same code, checking whether mesmerisation blocked movement to a given target. The various mesmerisation functions have become methods of player and were moved into behold.cc.
* Clean up random coordinate usage a bit.David Lawrence Ramsey2009-11-051-4/+1
| | | | | | | | Specifically, use random_in_bounds() in a few places instead of random ranges involving X_BOUND and Y_BOUND values. The former won't return any coordinates in the dungeon's map border (which acts as a wall), but the latter will, and all the changed places are looking for empty dungeon squares, so this should make these operations more efficient.
* Split up view.cc.Robert Vollmert2009-11-041-0/+2
|
* Implement map viewing for other levelsStefan O'Rear2009-11-021-2/+7
| | | | | | | There are three new commands described on the X? screen. Interlevel travel works. Other levels are not currently highlighted by reachability; let me know if you want this. Interface stolen from TAEB :). dpeg's stair view is not yet in.
* Make same square teleport no-scatter no-fail and no-contamination.Adam Borowski2009-11-021-1/+10
| | | | | We can have either this, making SIGHUP on teleport control prompt make you randomly teleport, or forcing a teleport on reload.
* Split up monstuff.ccMatthew Cline2009-11-011-0/+1
| | | | | | | A lot of monstuff.cc was moved into mon-abil.cc (monster abilities), mon-act.cc (the main monster loop), mon-behv.cc (monster behaviour) and mon-cast.cc (monster spells). mstuff2.cc was completely merged into other files.
* Merge mons_holiness() into monster::holiness(), and add an is_unholy()David Lawrence Ramsey2009-10-311-4/+1
| | | | convenience function.
* When using items that can directly turn monsters to zombies (weapons ofDavid Lawrence Ramsey2009-10-291-4/+8
| | | | | | shadows or chaos) as a good god worshipper, ensure that the "turns into a zombie" message always comes before the "enraged by your holy aura" message.
* (MONS_PROGRAM_BUG || -1) --> MONS_NO_MONSTERMatthew Cline2009-10-271-2/+2
| | | | | | | | | Change MONS_PROGRAM_BUG to MONS_NO_MONSTER when "no monster" is what was meant. Now all instances of MONS_PROGRAM_BUG should indicated some sort of failure or error. Also, fixed some places which were still using -1 instead of MONS_NO_MONSTER.
* Move player_see_invis into player class.Robert Vollmert2009-10-221-1/+1
|
* Updated levdes.vim for KPROP. NO_RTELE_INTO property.Jude Brown2009-10-221-1/+2
| | | | | | NO_RTELE_INTO restricts random teleport from choosing a specific grid square marked with this. This does not stop controlled teleport onto specific grid squares; controlled teleport is completely unrestricted. Updated documentation for new property. Do not apply to branch ends/Orb chamber yet, please!
* Slightly reduce religion.cc by yanking item-handling stuff to goditem.ccAdam Borowski2009-10-211-0/+1
|
* Add minor cosmetic fixes.David Lawrence Ramsey2009-10-211-2/+2
|
* Remove tabs, and add minor cosmetic fixes.David Lawrence Ramsey2009-10-201-1/+1
|
* versioning: remove SVN-specific revision data, add Git versioningSteven Noonan2009-10-181-1/+0
| | | | Signed-off-by: Steven Noonan <steven@uplinklabs.net>
* Naming consistency.Robert Vollmert2009-10-171-3/+3
| | | | | Mostly rename functions from terrain.h that accept features of typ dgn_feature_type from grid_is_* to feat_is_*.
* Add minor cosmetic fixes.David Lawrence Ramsey2009-10-161-1/+1
|
* Globally replace see_grid by see_cell.Robert Vollmert2009-10-171-10/+10
|
* Fix bug [2874791], Merfolk stat change issuesCharles Otto2009-10-161-12/+11
| | | | | | | | | | | | | Fix some conditions causing permanent stat loss or gain for Mf with stat modifying boots. Unmerge boots when the player starts levitating or flying on a water square. Use move_player_to_grid in blink, semi-controlled blink, and teleportation. Also fix a bug where Mf could random teleport into solid walls.
* Get rid of los_param outside of los.cc/losparam.cc.Robert Vollmert2009-10-161-1/+1
| | | | | | | | | | | The nicer interface to losight is now void losight(env_show_grid& sh, const coord_def& center, const opacity_func &opc = opc_default, const bounds_func &bds = bds_default); bounds_func provides the LOS boundary (usually just a circle with radius the current LOS radius). opacity_func is a mapping of grid coordinates to opacity values.
* Add more minor cosmetic fixes.David Lawrence Ramsey2009-10-131-1/+1
|
* Add minor cosmetic fixes.David Lawrence Ramsey2009-10-131-2/+2
|
* Rename Summon Wraiths to Haunt everywhere, for consistency, and adjustDavid Lawrence Ramsey2009-10-131-13/+15
| | | | the tiles accordingly.
* Rename Summon Wraiths to Haunt, make it a targetted spell, necro only,Adam Borowski2009-10-141-18/+44
| | | | that can summon multiple wraiths and ghosts (FR 2865657).
* Add minor cosmetic fixes.David Lawrence Ramsey2009-10-131-2/+2
|
* Make gods that take corpse offerings do so without the butchery step,David Lawrence Ramsey2009-10-111-1/+2
| | | | | | i.e., allow merely praying over said corpses. Now, the only gods that pay attention to butchery are Kikubaaqudgha and Elyvilon. Also, add several miscellaneous fixes.
* Remove a lot of unneccessary includes.Robert Vollmert2009-10-091-3/+0
| | | | | | | The console version still compiles on Linux; both console and tiles version compile in OS X. I haven't been able to test the DOS and Windows compiles -- please fix or tell me about any errors that show up.
* Convert remaining uses of losight to los_param-style.Robert Vollmert2009-10-081-1/+1
|
* Split LOS code from view.cc.Robert Vollmert2009-10-081-0/+1
| | | | | | | | | los.cc: basic raycasting algorithm; losight(), see_grid() etc. ray.cc: ray_def implementation. mon-los.cc: monster_los This includes adding a bunch of #includes; there's probably some obsolete includes of view.h now.
* Drop obsolete CVS last-committed headers ($Author$).Adam Borowski2009-10-061-2/+0
|
* Clean up the Kiku changes a bit.David Lawrence Ramsey2009-10-011-26/+39
|
* Applying Kiku patch by Alex MacDonald (timecircuits). Kiku now has an ↵evktalo2009-10-021-0/+85
| | | | | | | | invocation to provide corpses, provides (partial) torment resistance, provides torment when butchering while praying, and gifts Necromancy books. As the final gift, the player can choose between blessing the wielded weapon with Pain brand, or Necronomicon. Flavour and help texts haven't been altered yet. Signed-off-by: evktalo <evktalo@users.sourceforge.net>
* Add yet more minor cosmetic fixes.David Lawrence Ramsey2009-09-251-11/+11
|
* And add more consistency fixes.David Lawrence Ramsey2009-09-251-1/+3
|
* * Also allow Maurice to steal the occasional spellbook or piece ofj-p-e-g2009-09-241-0/+6
| | | | | | | | | | | | | jewellery. * As per FR 1937144, leave a purple cloud if the player or a monster blinks or teleports away. For some reason this doesn't yet work correctly with scrolls of blinking, even though wizard blink (which uses the same function) does work. -- (from svn) Signed-off-by: Darshan Shaligram <dshaligram@users.sourceforge.net>
* A bug fix commit! (I didn't do one of these in a while...)j-p-e-g2009-09-131-2/+2
| | | | | | | | | | | * 2856912: being turned into a pig while berserk complaining about being "too berserk" when unequipping the weapon * 2849963: shields working even when melded * 2845355: melded equipment not being affected by remove curse * 2836148: disallow toggle_with_I if you've got a spell on 'I' git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10671 c06c8d41-db1a-0410-9941-cceddc491573
* Commit several patches:j-p-e-g2009-09-131-0/+5
| | | | | | | | | | | | * patch 2849505 by weyrava: make submerged monsters use the correct colour * patch 2857771 by caotto: another Feawn update * patch 2838771 by camedo: add potions of brilliance/agility * BR 2841651 by bookofjude: allow Merfolk to control-tele into deep water Now we need tiles for the new potions! git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10669 c06c8d41-db1a-0410-9941-cceddc491573
* Generalized solution to the "disconnect at --more--" problem (e.g., disconnectzelgadis2009-07-281-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | at the more after "You have lost your religion!" to avoid the negative consequences of excommunication): when a HUP signal is received, instead of immediately saving the game, close the stdin stream, which will cause all of the Curses calls which normal block on key-presses to unblock, so that the code after a more() call will execute before the disconnected game is saved (which will happen in _input() in acr.cc). This only affects Curses (non-tiles/console) UNIX builds which have both USE_UNIX_SIGNALS and SIGHUP_SAVE defined. Exceptions to the above: * If HUP is received during a call to yesno() with safeanswer == 0, then the game will be saved immediately, since there's no way for the function to tell which answer is safe to give automatically. * If HUP is received while selecting the target for a controlled teleport then the teleport will be canceled, since otherwise a target other than the intended one might be the one under the cursor when the disconnect happened. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10443 c06c8d41-db1a-0410-9941-cceddc491573
* Apply caotto's patch in [2827204] to finish the plant god, with some dolorous2009-07-281-0/+3
| | | | | | | cleanups added by me. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10442 c06c8d41-db1a-0410-9941-cceddc491573
* * Prompt before moving while confused and next to lava/deep water.j-p-e-g2009-07-231-7/+3
| | | | | | | | * Change Portal Projectile range to LOS. * Fix crash with Summon Horrible Things if there's not enough space. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10380 c06c8d41-db1a-0410-9941-cceddc491573
* * Fix Xom gifts not going Splash! in deep water.j-p-e-g2009-07-231-0/+15
| | | | | | | | * Limit Xom tele rounds to a maximum of 12 (unlikely, but you know...) * Update player doll for Merfolk entering/leaving water. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10379 c06c8d41-db1a-0410-9941-cceddc491573
* Make fish on dry land (due to Feawn's Sunlight power) flop about andj-p-e-g2009-07-211-19/+24
| | | | | | | | | | lose hit points until back in water, using ENCH_AQUATIC_LAND. (Bug 2824663) Also fix tiles compilation (patch 2824632) and add DATA_DIR_PATH to tiled icons (patch 2824635). Both patches (and some more) by Trent W. Buck. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10364 c06c8d41-db1a-0410-9941-cceddc491573
* Fix 2822832: temporary brands not being removed when thrown with LRET_FUMBLEDj-p-e-g2009-07-201-2/+3
| | | | | | | | | | | | | | plus: thrown weapon permabrand being removed when DUR_WEAPON_BRAND is active plus: double messaging of "You are now empty-handed." Fix 2810517: Added a pre-ability requirements check that handles Lugonu's enter/exit abyss, berserking, recite, breath attacks and some more. If the requirements aren't met, the check fails before the success check, thus no turn is wasted. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10360 c06c8d41-db1a-0410-9941-cceddc491573