summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/branch.cc
Commit message (Collapse)AuthorAgeFilesLines
* Let uniques spawn in Orc. (dpeg)Jude Brown2009-12-071-1/+1
| | | | | At the very least, give control of uniques spawning in Orc over to unique.des.
* Only place natural and magical traps in Slime.Jude Brown2009-12-071-1/+1
| | | | The jellies and acid blobs would've eaten any mechanical traps.
* Move Tomb branch flag no_tele_control from crypt.des to branch.cc.Robert Vollmert2009-11-201-1/+2
| | | | | | | | | | This fixes shaft traps being generated on Tomb:1; apparently, BFLAGS: was being interpreted after placing traps on the level; shaft traps are not placed in no-telecontrol levels. A better fix would be to make sure BFLAGS is called earlier. Alternatively, BFLAGS could be remove -- it doesn't appear to be used any more.
* versioning: remove SVN-specific revision data, add Git versioningSteven Noonan2009-10-181-1/+0
| | | | Signed-off-by: Steven Noonan <steven@uplinklabs.net>
* Remove a lot of unneccessary includes.Robert Vollmert2009-10-091-1/+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.
* Add comment fix.David Lawrence Ramsey2009-10-071-3/+3
|
* Allow Gastronok and Prince Ribbit to generate in the Lair. (due)Adam Borowski2009-10-071-3/+3
|
* Drop obsolete CVS last-committed headers ($Author$).Adam Borowski2009-10-061-2/+0
|
* Shorten Lair to 8 levels. j-p-e-g2009-09-131-1/+1
| | | | | | | | | | | | | | In monster generation I collapsed monsters of Lair:1-2 to Lair:1 and Lair:3-4 to Lair:2, with the rest following as usual. Monster weights have *not* been changed. The subbranch entrances are now as follows: Swamp/Shoals: 2-5 Snake : 3-6 Slime Pits : 5-8 git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10666 c06c8d41-db1a-0410-9941-cceddc491573
* [2765110] Making capitalization of branch name articles more consistent.ennewalker2009-04-191-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9644 c06c8d41-db1a-0410-9941-cceddc491573
* Remove references to unimplemented branches (Caverns, Pit, Inferno).j-p-e-g2009-03-141-27/+8
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9474 c06c8d41-db1a-0410-9941-cceddc491573
* [2418267] Disable stair connectivity fixups in the Tomb so that vault stair ↵dshaligram2009-02-201-1/+1
| | | | | | placement is preserved. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9141 c06c8d41-db1a-0410-9941-cceddc491573
* Cut Hive depth to 2.j-p-e-g2009-01-191-1/+1
| | | | | | | Could someone check the Hive vaults, please? git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8586 c06c8d41-db1a-0410-9941-cceddc491573
* Add yet another unique courtesy of castamir: Dissolution, sentientj-p-e-g2009-01-101-1/+1
| | | | | | | | jelly. Update Credits. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8382 c06c8d41-db1a-0410-9941-cceddc491573
* Adding REVISION() macro to all source files.ennewalker2009-01-041-0/+2
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8217 c06c8d41-db1a-0410-9941-cceddc491573
* Apply a patch by castamir to fix a multitude of typos.j-p-e-g2008-12-281-1/+1
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8005 c06c8d41-db1a-0410-9941-cceddc491573
* Enable vault generation for non-LEVEL_DUNGEON levels, make ziggurat eligible ↵dshaligram2008-11-251-0/+21
| | | | | | for random gen in main dungeon and Pan; still needs entry portal timing/charging fixes, and ziggurat builder is still incomplete. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7601 c06c8d41-db1a-0410-9941-cceddc491573
* Fix the Vestibule having no upstairs. o_Oj-p-e-g2008-06-151-1/+1
| | | | | | | Fix fleeing monsters shooting at you. (BR 1994462) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5861 c06c8d41-db1a-0410-9941-cceddc491573
* Remove unneeded methods (including the old resistance screen), renamej-p-e-g2008-06-121-2/+1
| | | | | | | 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
* Add still more whitespace fixes.dolorous2008-04-211-6/+6
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4432 c06c8d41-db1a-0410-9941-cceddc491573
* The level-builder now enforces the constraint that every contiguous region ↵dshaligram2008-04-101-6/+6
| | | | | | on a level must include at least one stair (ekiM). This guarantee does not apply to areas inside vaults (the builder assumes vault-designers are sane) and does not apply to certain branches (Swamp, Shoals, the branches of Hell), or the non-Dungeon areas (Abyss, Pan, Bazaars). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4169 c06c8d41-db1a-0410-9941-cceddc491573
* Added Flight card to Deck of Emergency.haranp2008-04-041-0/+6
| | | | | | | Artefacts yield 2 piety instead of 1. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4070 c06c8d41-db1a-0410-9941-cceddc491573
* bug 1916515: Roll back a portion of r3460 which broke zot. But why?pauldubois2008-03-171-9/+9
| | | | | | | Will leave bug open until we find out. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3689 c06c8d41-db1a-0410-9941-cceddc491573
* [Bug 1907221] Add "Modified for Crawl Reference" statement and author to aj-p-e-g2008-03-081-0/+3
| | | | | | | | huge number of files. Also correct file name comments. No coding changes. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3539 c06c8d41-db1a-0410-9941-cceddc491573
* Outsource randart names.j-p-e-g2008-02-241-9/+9
| | | | | | | | | | | Also: - Move database text files into subfolder "database", yay! - Don't print "uncursed" for identified randart weapons/jewellery as the status should be obvious once the name is known. - A bit of code cleanup (change in enum.h breaks saves!) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3460 c06c8d41-db1a-0410-9941-cceddc491573
* Bunch of changes:haranp2007-11-131-16/+14
| | | | | | | | | | | | | | Removed unnecessary static_casts<> from branch.cc, improved messages a bit. Removed incorrect caps from entomb(). Changed ornate/legendary bonuses from percentages to flat power bonuses (+150 and +300 respectively.) Ensured at least one Nemelex gift by the time you get the first power. Changed probability of Nemelex liking a gift, made it dependent on piety. Fix warning in cloud.cc. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2850 c06c8d41-db1a-0410-9941-cceddc491573
* The number of traps randomly generated on a level, and which types ofzelgadis2007-11-131-0/+25
| | | | | | | | | | | traps are randomly selected, can now easily be controlled on a branch by branch basis (and for Pan and the Abyss), similar to how monster level and rarity is controlled (via function pointers in the Branch data structure). The same can be done for fog machines (though this feature isn't being used as of yet). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2846 c06c8d41-db1a-0410-9941-cceddc491573
* Shaft traps (trap doors) [1792195] and level annotation [1769009]zelgadis2007-10-051-23/+23
| | | | | | | | | | added, with the shaft traps changed as per comments on SF; shafts aren't randomly generated yet, so this doesn't change gameplay. Changed DNGN_TRAP_III to DNGN_TRAP_NATURAL, of which trap type the shaft traps are the only current member. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2328 c06c8d41-db1a-0410-9941-cceddc491573
* Added svn properties svn:keywords and svn:eol-style to files which werezelgadis2007-10-031-1/+1
| | | | | | | missing them. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2301 c06c8d41-db1a-0410-9941-cceddc491573
* This commit breaks save file compatability.zelgadis2007-09-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Lots of new things that amuse/stimulate Xom, and a few things which don't amuse him as much anymore. Among the new things is a corpse turning into a skeleton while butchering it; if this is too harsh to do just for Xom's amusement (previously turning into a skeleton while butchering was an ignored case and still produced chunks of flesh) it can be changed back. Also, if a Xom worshiper draws the Blank card, Xom makes it act like a Xom card, since a plain old Blank card is boring. Keep track of which branch the Orb is in, if the player isn't carrying it. Keep track of how/why the player ended up in a particular level type (Abyss, Pan, etc). Changed most "a distortion effect" cause strings for distortion caused tranlsocation miscast effects to something more specific. Added new wizard commands 'C' to curse or uncruse an item, and 'Ctrl-A' to re-generate the Abyss. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2256 c06c8d41-db1a-0410-9941-cceddc491573
* This change moves the logic for when a level or branch prohibitszelgadis2007-09-191-23/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | teleport control from the C++ code into the vault .des files. This is done with the additions of two things: * Changeable, persistent per-level and per-branch flags which affect game play. * Dungeon events for the killing of monsters, picking up of objects and changing of features. The current level and branch flags are for teleport control prevention, making a level unmappable (like the Abyss or a Labyrinth), and preventing magic mapping from working (like the Abyss or a Labyrinth). Some related changes: * The new .des header KMASK allows for dungeon grid masks like no_monster_gen to be applied to specific symbols rather than the entire vault. * If the wizard mapping command (&{) is used in a place which is unmappable, it will ask if you wish to force the area to be mappable (so you can see what an entire Labyrinth or Abyss level looks like without having to hack the source). * A new wizard-mode level-map command, 'T', will teleport the player to wherever the cursor is pointing. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2146 c06c8d41-db1a-0410-9941-cceddc491573
* Added Lemuel's mines minivaults.dshaligram2007-05-091-0/+10
| | | | | | | Extended map DEPTH: attribute to support branch specifiers and negated depth specifiers. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1442 c06c8d41-db1a-0410-9941-cceddc491573
* Interlevel travel tweaks:dshaligram2007-05-091-32/+23
| | | | | | | | | | | | | | * ^P at branch prompt selects the parent branch of the branch you're in (or the main dungeon if you're in the main dungeon). * The depth prompt is always shown, even for single-level branches. This may need to be rolled back if it's too annoying. * At the depth prompt, you can use < to go one level above the default (navigating up into the parent branch if necessary) and > to go one level below the default (never navigating into deeper branches). - or p or ^P will change the default to the level closest to the current default in the parent branch. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1437 c06c8d41-db1a-0410-9941-cceddc491573
* s/island/shoal/haranp2007-04-271-4/+4
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1383 c06c8d41-db1a-0410-9941-cceddc491573
* Added a new Island branch, based on dpeg's ideas.haranp2007-04-121-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | In any given game, either the Islands or the Swamp will be generated (50% chance of each) as Lair subbranches. The Islands have a ranged-attackers theme and are 5 levels deep. THIS IMPLEMENTATION IS INCOMPLETE, so beware! The following things need to be added: 1. A level-5 vault to contain the islands rune (the rune is coded, but it doesn't show up yet - so for now, if you get the Islands, you'll be stuck with one less rune.) A unique Cyclops, Polyphemus, to guard it might be a nice idea. Perhaps we should block controlled teleport until he's dead, too. 2. Making the island structure depth-dependent (i.e., more islands on deeper levels.) 3. Shallow water fractalisation. 4. Probably more stuff I forgot. I also put in various minor fixes. Breaks savefiles, possibly highscores too. I'll put in a savefile version bump later. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1289 c06c8d41-db1a-0410-9941-cceddc491573
* Removed pointless *level_builder_function from branches[].haranp2007-04-101-22/+22
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1277 c06c8d41-db1a-0410-9941-cceddc491573
* More refactoring.haranp2007-04-071-0/+6
| | | | | | | | Removed the limit on how many monsters can be generated as I don't think it was ever being reached. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1257 c06c8d41-db1a-0410-9941-cceddc491573
* Preliminary refactoring in dungeon creation code.haranp2007-04-071-22/+34
| | | | git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1255 c06c8d41-db1a-0410-9941-cceddc491573
* Refactored out branches into branch.h and branch.cc.haranp2006-12-201-0/+184
NOTE: This commit is *buggy*; the final Hell vaults contain buggy runes now. Will fix later; this is a benchmark, since hopefully everything else works. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@682 c06c8d41-db1a-0410-9941-cceddc491573