summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spells2.h
Commit message (Collapse)AuthorAgeFilesLines
* Continuation of the range combat overhaul: branding spells.Jude Brown2010-01-011-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As outlined in dpeg's ranged combat overhaul, branding spells should no longer be permanant, nor apply directly to the ammunition. This commit removes all previous "<X> Ammunition" spells, including the original "Poison Ammunition" spell. Instead, branding ammunition is now done via the launcher and the currently existent weapon branding spells. Currently, those that can be applied to a launcher are: Fire Brand, Freezing Aura and Poison Weapon. There is the capacity of Excruciating Wounds to also be applied, but this would require the addition of the Pain ego for missiles, of which the mechanics would need to be decided upon first. Like temporary brands on weapons currently, these brands on launchers are permanantly affixable by using a scroll of vorpalise weapon. This commit also overhauls the Arcane Marksman class. It began by removing the non-existent ammunition spells; this left Devastating Missiles with two spells: haste and deflect missiles. On reflection, I decided to delete the book instead. The Book of Elemental Missiles was easily adjusted by replacing the three branding spells by the existent (and aforementioned) branding spells. As there are no (according to the 0.6 ranged combat overhaul spec) spells intended for use with translocation effects on missiles, this left The Book of Warped Missiles rather empty. Attempts were made (with discussion with Eronarn on IRC) to work out something else to fill up the Book of Warped Missiles with, but I made the decision to get rid it instead, as the only good suggestions basically made it the Book of Spatial Translocations, and in that case, the player may as well select the warper class. We also discussed whether or not to remove Poison Weapon from the Elemental starting book; I decided it was best to leave it now, but increase its level from 2 to 3, to give the book more of a range of levels (starting a Spriggan Arcane Marksman had all the spells listed as "excellent" or "very good"; more on this shortly). I also decided that Repel Missiles is over-used in this context, and upon Eronarn's suggestion and sorear's agreement, have replaced it with Cause Fear. I think this will provide for interesting game play, and that the level of the spell is suitably high enough for it to not be abused. I also made the executive decision that "Elemental Missiles" was no longer an appropriate title, as it didn't contain any ammunition-specific spells any longer, and have renamed the book to the "Book of Brands". It is now: Book of Brands Level 1, Corona Level 2, Swiftness Level 2, Fire Brand Level 2, Freezing Aura Level 3, Poison Weapon Level 5, Cause Fear As the Arcane Marksmen class is now launcher-specific, rather than ammunition-specific, I have adjusted it to no longer give Hill Orcs, Sludge Elves and Merfolk javelins and throwing nets (they get bows like everyone else), and made the decision to ban Trolls and Ogres from the class altogether. The reasoning here is that they have bad launcher aptitudes, and as they are described as "marksmen", it makes no sense to give them a book full of launcher-specific spells and some large rocks and throwing nets. This change could, of course, be reverted, and they could simply be given bows, crossbows or slings as relevant, in line with all other races being given launchers and ammunition. I have adjusted the starting skill levels for enchantments, spell- casting and dodging to that of Crusaders. I have also removed Poison Ammunition from the Book of Envenomations, and replaced it with Poison Weapon instead. Finally, I have increased TAG_MAJOR_VERSION to 14.
* headers: fix inconsistent struct/class forward declarationsSteven Noonan2009-12-291-2/+2
| | | | | | | Some classes were erroneously referred to as 'struct' in forward declarations, and vice versa. Signed-off-by: Steven Noonan <steven@uplinklabs.net>
* A start at a dLua spells library.Jude Brown2009-12-251-2/+2
| | | | | | | | | | | Provides wrappers for non-player Toxic Radiance and Ozocubu's Refrigeration. These are basically just an adjustment of kill categories and messages to allow them to be used as background effects in WizLabs (Ozocubu's and Olgreb's). Hopefully a wrapper for monster (and possibly player)-cast bolt structures can also be included, which could then be accessed with the (planned) Lua traps functionality.
* Remove Zin's summoning-based wrath, as it no longer fits.David Lawrence Ramsey2009-11-181-3/+1
| | | | | | | | | First, Jiyva considers eyeballs slimes for his purposes. Second, insect plagues are more suited to old Zin, who coupled them with angels for an Old Testament theme, so to speak. (The latter is most closely suited to Fedhas, or it would be if he were the god of nature in general instead of just plants and fungi. It's also inappropriate for Zin now, since one of the insects summoned causes disease and is, hence, chaotic.)
* Split itemprop enums out into itemprop-enum.h.Robert Vollmert2009-11-171-1/+1
| | | | Other headers now don't need to include all of itemprop.h.
* Flatten header dependencies a bit.Robert Vollmert2009-11-171-1/+1
| | | | | | This removes a couple of unnecessary includes from header files. I may have missed adding some tiles includes.
* Make brand_ammo() return bool, indicating whether it succeeded.David Lawrence Ramsey2009-11-151-1/+1
|
* Move brand_ammo() to spells2.{cc,h}, right after brand_weapon().David Lawrence Ramsey2009-11-151-0/+1
|
* Move Feawn's abilities to godabil.h/ccCharles Otto2009-11-061-13/+0
|
* Make some passed references const.Robert Vollmert2009-11-061-1/+2
| | | | | | A couple of the Feawn functions were passed read-only arguments (coordinate center, etc.) as non-const references, which leaked out to require you.pos() to be non-const.
* Make "int rain()" take a const coord_def&.Robert Vollmert2009-11-061-1/+1
|
* (MONS_PROGRAM_BUG || -1) --> MONS_NO_MONSTERMatthew Cline2009-10-271-1/+1
| | | | | | | | | 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.
* Revert radiance and refrigeration patches for the moment.Robert Vollmert2009-10-161-3/+2
| | | | | | | | | | There's a couple of issues with these that were missed. This reverts commits 70c41610927b7f9adfc3a0fd6c72c7af6756427e dce44e60507ec723f3cf94cdeadc6762ee492786 6525d257d208e990f5d62213adf6a062943e6626 6d9b6f226847487b3fd9e2ff408d7c0f42361c93.
* Set killer for monster refrigeration.Robert Vollmert2009-10-161-1/+2
|
* Resolve issues with monster-cast refrig/radiance kills being assigned to player.Jude Brown2009-10-161-1/+1
|
* Make Toxic Radiance and Refrigeration monster castable.Jude Brown2009-10-161-1/+1
| | | | | | Allow player ghosts and random pandemonium lords to also cast it. Signed-off-by: Robert Vollmert <rvollmert@gmx.net>
* Drop obsolete CVS last-committed headers ($Author$).Adam Borowski2009-10-061-2/+0
|
* Apply RjY's patch in [2828451], slightly tweaked, to fix compilation.dolorous2009-07-281-3/+2
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10452 c06c8d41-db1a-0410-9941-cceddc491573
* Apply caotto's plant god patch, for now named "Feawn".j-p-e-g2009-07-201-0/+14
| | | | | | | Also fix potions of porridge's menu colour being yellow for Mummies. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10355 c06c8d41-db1a-0410-9941-cceddc491573
* Add minor cosmetic fixes.dolorous2009-03-131-3/+3
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9437 c06c8d41-db1a-0410-9941-cceddc491573
* Axe some more obsolete functions as well as the rotting ability thatj-p-e-g2009-02-271-4/+0
| | | | | | | isn't used anywhere. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9256 c06c8d41-db1a-0410-9941-cceddc491573
* Fix warning.haranp2009-02-151-11/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9096 c06c8d41-db1a-0410-9941-cceddc491573
* Display basic resistance information. I'm putting this in so thatharanp2009-01-101-6/+1
| | | | | | | | there'll be a base to work on; of course the format can (and should) be improved. Currently it's one line per resistance. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8396 c06c8d41-db1a-0410-9941-cceddc491573
* Expand the setting of spell_type in mgen_data to include all dolorous2009-01-031-3/+3
| | | | | | | | monster-creating spells, and avoid assertion failures caused by setting an abjuration duration of 0 and a spell_type to something other than 0. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8162 c06c8d41-db1a-0410-9941-cceddc491573
* Add yet more holy being-related cleanups.dolorous2008-10-301-0/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7317 c06c8d41-db1a-0410-9941-cceddc491573
* Add more holy being-related cleanups.dolorous2008-10-301-4/+4
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7315 c06c8d41-db1a-0410-9941-cceddc491573
* Add various holy being-related cleanups.dolorous2008-10-301-3/+4
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7312 c06c8d41-db1a-0410-9941-cceddc491573
* Add still more minor cosmetic fixes.dolorous2008-10-301-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7311 c06c8d41-db1a-0410-9941-cceddc491573
* Make Zin's retribution-summoned plagues permanent.dolorous2008-10-301-3/+2
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7309 c06c8d41-db1a-0410-9941-cceddc491573
* For consistency, rename "Summon Guardian" to "Summon Angel".dolorous2008-10-191-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7290 c06c8d41-db1a-0410-9941-cceddc491573
* 2058436: better interface for the range-1 attack spells.haranp2008-09-201-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6955 c06c8d41-db1a-0410-9941-cceddc491573
* Remove pre-Stone Soup change history from source files, and push it allj-p-e-g2008-09-141-4/+0
| | | | | | | | | | into a file crawlhistory.txt in docs/obsolete. I used a perl script to do this under the assumption that all these change logs used the same system following the keyword "Change History". git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6930 c06c8d41-db1a-0410-9941-cceddc491573
* Massive overhaul to move towards coord_def().haranp2008-07-301-96/+2
| | | | | | | | | | This might have introduced some bugs: I now get intermittent crashes on startup (this might have to do with the changes to special_room.) Sorry about that - committing before I need to do any more big conflict resolutions. Fixes coming later. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6732 c06c8d41-db1a-0410-9941-cceddc491573
* Simplify.dolorous2008-06-241-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6100 c06c8d41-db1a-0410-9941-cceddc491573
* Overhaul god gift handling again so that we can tell which god sent dolorous2008-06-121-15/+15
| | | | | | | | | | | which gift. There was an unused god parameter in the monsters struct, which was probably intended to hold which god a monster worshipped. I've used it as an indicator of which god sent the monster, under the assumption that gods would send their own worshippers as gifts. (I hope this isn't an abuse of it.) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5748 c06c8d41-db1a-0410-9941-cceddc491573
* Add yet more minor cosmetic fixes.dolorous2008-06-121-8/+13
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5747 c06c8d41-db1a-0410-9941-cceddc491573
* After some more thought, remove the god gift exceptions for dolorous2008-06-101-1/+1
| | | | | | | | natural-phenomenon-type monsters. Fire vortices still need to be dealt with properly, though. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5716 c06c8d41-db1a-0410-9941-cceddc491573
* Reorganize again.dolorous2008-06-101-10/+14
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5707 c06c8d41-db1a-0410-9941-cceddc491573
* Don't mark spatial vortices as god gifts anymore, as (a) they're just dolorous2008-06-101-1/+0
| | | | | | | | | | phenomena that the game happens to treat as monsters (as opposed to actual creatures), and (b) there's no easy way to mark fire vortices as code for when god gifts, either, since they're only placed in the beam routine for "Fire Storm". git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5679 c06c8d41-db1a-0410-9941-cceddc491573
* Add a few more message tweaks.dolorous2008-06-091-2/+2
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5677 c06c8d41-db1a-0410-9941-cceddc491573
* Tweak summoning-related messages again.dolorous2008-06-091-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5676 c06c8d41-db1a-0410-9941-cceddc491573
* Convert the shadow- and spatial vortex-summoning routines to use power dolorous2008-06-091-1/+1
| | | | | | | values, in case they're ever used elsewhere. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5670 c06c8d41-db1a-0410-9941-cceddc491573
* Consolidate the shadow- and vortex-summoning routines some more.dolorous2008-06-091-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5668 c06c8d41-db1a-0410-9941-cceddc491573
* Consolidate the (single) spatial vortex-summoning routines, and add more dolorous2008-06-091-1/+2
| | | | | | | minor cleanups. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5667 c06c8d41-db1a-0410-9941-cceddc491573
* Clean up the routines to animate the dead.dolorous2008-06-091-16/+0
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5621 c06c8d41-db1a-0410-9941-cceddc491573
* Add miscellaneous minor fixes.dolorous2008-06-091-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5620 c06c8d41-db1a-0410-9941-cceddc491573
* Move summon_demon_type() to spells3.cc as well.dolorous2008-06-081-1/+0
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5613 c06c8d41-db1a-0410-9941-cceddc491573
* Add more minor cosmetic fixes.dolorous2008-06-081-3/+0
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5612 c06c8d41-db1a-0410-9941-cceddc491573
* Move most of the demon-summoning routines to spells3.cc, since they're dolorous2008-06-081-7/+0
| | | | | | | unholy. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5611 c06c8d41-db1a-0410-9941-cceddc491573
* Clean up "Twisted Resurrection" some more.dolorous2008-06-081-7/+0
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5610 c06c8d41-db1a-0410-9941-cceddc491573