From 82c469a3a5b523c0b82229d289b122e3868324cc Mon Sep 17 00:00:00 2001 From: dshaligram Date: Sat, 30 Dec 2006 09:01:17 +0000 Subject: 0.1.7 backport: * GOD_GIFT was not set for TSO and Zin minions. * Turn counter display. * New temple levels. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.1.7@738 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/abl-show.cc | 4 +- crawl-ref/source/acr.cc | 4 + crawl-ref/source/dat/splev.des | 322 ++++++++++++++++++++++++++++++----------- crawl-ref/source/delay.cc | 7 + crawl-ref/source/output.cc | 17 +++ crawl-ref/source/output.h | 9 +- crawl-ref/source/stuff.cc | 1 + crawl-ref/source/view.cc | 1 + 8 files changed, 274 insertions(+), 91 deletions(-) diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index 8202fa0e55..5d75197509 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -862,7 +862,7 @@ bool activate_ability(void) break; case ABIL_ZIN_SUMMON_GUARDIAN: - summon_ice_beast_etc(you.skills[SK_INVOCATIONS] * 4, MONS_ANGEL); + summon_ice_beast_etc(you.skills[SK_INVOCATIONS] * 4, MONS_ANGEL, true); exercise(SK_INVOCATIONS, 8 + random2(10)); break; @@ -894,7 +894,7 @@ bool activate_ability(void) break; case ABIL_TSO_SUMMON_DAEVA: - summon_ice_beast_etc(you.skills[SK_INVOCATIONS] * 4, MONS_DAEVA); + summon_ice_beast_etc(you.skills[SK_INVOCATIONS] * 4, MONS_DAEVA, true); exercise(SK_INVOCATIONS, 8 + random2(10)); break; diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index b71211e8f9..ea154352dd 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -2088,7 +2088,10 @@ static void world_reacts() { bool its_quiet; //jmf: for silence messages if (you.num_turns != -1) + { you.num_turns++; + update_turn_count(); + } run_environment_effects(); @@ -2798,6 +2801,7 @@ static bool initialise(void) draw_border(); new_level(); + update_turn_count(); travel_init_new_level(); // Mark items in inventory as of unknown origin. diff --git a/crawl-ref/source/dat/splev.des b/crawl-ref/source/dat/splev.des index 96c2ee5f81..973a27830d 100644 --- a/crawl-ref/source/dat/splev.des +++ b/crawl-ref/source/dat/splev.des @@ -63,12 +63,14 @@ # # Guidelines for creating new vault maps: # -# [ds] If your map is not a minivault, make sure the side(s) that form the -# border have a rock wall padding at least 6 deep. For instance, if your map -# is ORIENT: north, you must have a 6 deep border of rock wall (or any -# other kind of wall) along the northern, eastern, and western edges of the -# map. If you're doing a fullscreen map (encompass), you must pad all around -# the map with 6 layers of wall. +# If your map is not a minivault, make sure the side(s) that form the border +# have a rock wall padding at least 6 deep. For instance, if your map is +# ORIENT: north, you must have a 6 deep border of rock wall (or any other kind +# of wall) along the northern, eastern, and western edges of the map. If +# you're doing a fullscreen map (encompass), you must pad all around the map +# with 6 layers of wall. For ORIENT: encompass maps, you don't need to +# explicitly include the padding provided you make the map small enough that +# the padding can be provided automatically. # # Basically you can just let your creativity run wild. You do not have # to place all of the stairs unless the level is full screen, in which @@ -87,9 +89,15 @@ # ps - remember to add one to the monster array value when placing monsters # on each map (it is 1-7, not 0-6) {dlb} # -# [dshaligram] All special levels MUST have an ORIENT: attribute; if there's -# no ORIENT: attribute, the level is considered to be a minivault, which is -# usually not what you want. +# All vaults MUST have an ORIENT: attribute; if there's no ORIENT: attribute, +# the vault is considered to be a minivault, which is usually not what you +# want. +# +# Minivaults are handled very differently from regular vaults and special +# levels. They're placed *after* normal map generation, whereas normal vaults +# are placed before generating the rest of the level. There's no way to +# guarantee generation of a minivault on a particular level, whereas vaults +# can be forced to appear using a PLACE: attribute. # # Special levels are selected either by PLACE: (for most special levels) or # TAGS: (for the Pandemonium demon lords). If you want to define alternate @@ -1179,85 +1187,237 @@ MONS: random, random ########################################################################## -# Ecumenical temple +# Circular temple (David Ploog). -NAME: temple +NAME: circular_temple PLACE: Temple +FLAGS: no_rotate ORIENT: encompass MAP -xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxxxxxxxxxxxxccccccccccccccccccccccccccxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxxxxxxxxxxxcc............<............cxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxxxxxxxxxxcc...........................cxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxxxxxxxxxcc.............................cxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxxxxxxxxcc...............................cxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxxxxxxxcc.................................cxxxxxxxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxxxxxxcc...................................cxxxxxxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxxxxxcc.....................................cxxxxxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxxxxcc.......................................cxxxxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxxxcc.........................................cxxxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxxcc...........................................cxxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxcc.............................................cxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxcc...............................................cxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxcc.................................................cxxxxxxxxxxxxxxx -xxxxxxxxxxxxcc...................................................cxxxxxxxxxxxxxx -xxxxxxxxxxxcc..........................B..........................cxxxxxxxxxxxxx -xxxxxxxxxxcc.......................................................cxxxxxxxxxxxx -xxxxxxxxxcc.....................B.............B.....................cxxxxxxxxxxx -xxxxxxxxcc...........................................................cxxxxxxxxxx -xxxxxxxxc.............................................................cxxxxxxxxx -xxxxxxxxc.............................................................cxxxxxxxxx -xxxxxxxxc.................B.........................B.................cxxxxxxxxx -xxxxxxxxc..............................T..............................cxxxxxxxxx -xxxxxxxxc.............................................................cxxxxxxxxx -xxxxxxxxc.............................................................cxxxxxxxxx -xxxxxxxxc.............................................................cxxxxxxxxx -xxxxxxxxc.............................................................cxxxxxxxxx -xxxxxxxxc.............................................................cxxxxxxxxx -xxxxxxxxc..............B...............................B..............cxxxxxxxxx -xxxxxxxxc(....................T.................T....................{cxxxxxxxxx -xxxxxxxxc.............................................................cxxxxxxxxx -xxxxxxxxc.............................................................cxxxxxxxxx -xxxxxxxxc.............................................................cxxxxxxxxx -xxxxxxxxc.............................................................cxxxxxxxxx -xxxxxxxxc.............................................................cxxxxxxxxx -xxxxxxxxc.............................................................cxxxxxxxxx -xxxxxxxxc................B...........................B................cxxxxxxxxx -xxxxxxxxcc...........................................................ccxxxxxxxxx -xxxxxxxxxcc............................T............................ccxxxxxxxxxx -xxxxxxxxxxcc.......................................................ccxxxxxxxxxxx -xxxxxxxxxxxcc.....................................................ccxxxxxxxxxxxx -xxxxxxxxxxxxcc...................................................ccxxxxxxxxxxxxx -xxxxxxxxxxxxxcc.................................................ccxxxxxxxxxxxxxx -xxxxxxxxxxxxxxcc...............B................B..............ccxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxcc.............................................ccxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxxcc.....................B.....................ccxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxxxcc.........................................ccxxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxxxxcc.......................................ccxxxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxxxxxcc.....................................ccxxxxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxxxxxxcc...................................ccxxxxxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxxxxxxxcc.................................ccxxxxxxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxxxxxxxxcc...............................ccxxxxxxxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxxxxxxxxxcc.............................ccxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxxxxxxxxxxcc...........................ccxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxxxxxxxxxxxcc............[............ccxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxxxxxxxxxxxxcccccccccccccccccccccccccccxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxcccccccccccccxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxcccc.....<.....ccccxxxxxxxxxxxxxxxx +xxxxxxxxxxxxcccc.................ccccxxxxxxxxxxxxx +xxxxxxxxxxccc.......................cccxxxxxxxxxxx +xxxxxxxxxcc.............B.............ccxxxxxxxxxx +xxxxxxxxcc.......B.............B.......ccxxxxxxxxx +xxxxxxxcc...............................ccxxxxxxxx +xxxxxxxc.................................cxxxxxxxx +xxxxxxcc.....B.....................B.....ccxxxxxxx +xxxxxxc...............T...T...............cxxxxxxx +xxxxxxc...................................cxxxxxxx +xxxxxxc...................................cxxxxxxx +xxxxxxc(...B.......T.........T.......B...{cxxxxxxx +xxxxxxc...................................cxxxxxxx +xxxxxxc...................................cxxxxxxx +xxxxxxc...............T...T...............cxxxxxxx +xxxxxxcc.....B.....................B.....ccxxxxxxx +xxxxxxcc.................................cxxxxxxxx +xxxxxxxcc...............................ccxxxxxxxx +xxxxxxxxcc.......B.............B.......ccxxxxxxxxx +xxxxxxxxxcc.............B.............ccxxxxxxxxxx +xxxxxxxxxxccc.......................cccxxxxxxxxxxx +xxxxxxxxxxxxcccc.................ccccxxxxxxxxxxxxx +xxxxxxxxxxxxxxxcccc.....[.....ccccxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxcccccccccccccxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +ENDMAP + +############################################################################## +# Three leaves temple (David Ploog) + +NAME: three_leaves__temple +PLACE: Temple +FLAGS: no_rotate +ORIENT: encompass + +MAP +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxbbbxxxxxxxxxxxxxxxbbbxxxxxxxxxxxxx +xxxxxxxxxxxxbbb.bbxxxxxxxxxxxxxbb.bbbxxxxxxxxxxx +xxxxxxxxxxxbb....bbxxxxxxxxxxxbb....bbxxxxxxxxxx +xxxxxxxxxxbb......bbbxxxxxxxbbb......bbxxxxxxxxx +xxxxxxxxxbb.....B...bbxxxxxbb...B.....bbxxxxxxxx +xxxxxxxxbb..B........bbbxbbb........B..bbxxxxxxx +xxxxxxxxbb.............bbb.............bbxxxxxxx +xxxxxxxbb....B....B.....b.....B....B....bbxxxxxx +xxxxxxxbb............{.....[............bbxxxxxx +xxxxxxxxbbbbbbbb........b........bbbbbbbbxxxxxxx +xxxxxxxxxxxxxxxbbbbbbbb...bbbbbbbbxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxbb.(.bbxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxbb.....bbxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxbb.......bbxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxbb....B....bbxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxbb...........bbxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxbb....B...B....bbxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxbb.......B.......bbxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxbbb...........bbbxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxbbbb.....bbbbxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxbbbbbbbxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +ENDMAP + +############################################################################## +# Twelve chambers temple (David Ploog). + +NAME: twelve_chambers_temple +PLACE: Temple +FLAGS: no_rotate +ORIENT: encompass + +MAP +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvxxxxxxx +xxxxxxvvvvvvvvvvv..................................vvvvvvvvvxxxxxxx +xxxxxxvvvvvvv.....vvv.vvvvvvv.vvvvvvv.vvvvvvv.vvvv.....vvvvvxxxxxxx +xxxxxxvvvvv...vvvvv.....vvv.....vvv.....vvv.....vvvvvv...vvvxxxxxxx +xxxxxxvvvvv.vvvvvv...B...v...B...v...B...v...B...vvvvvvv.vvvxxxxxxx +xxxxxxvv.....vvvvv.......v.......v.......v.......vvvvv.....vvxxxxxx +xxxxxxv.......vvvvv.....vvv.....vvv.....vvv.....vvvvv.......vxxxxxx +xxxxxxv..B....vvvvvvv.vvvvvvv.vvvvvvv.vvvvvvv.vvvvvvv....B..vxxxxxx +xxxxxxv........vvvvvv.vvvvvvv.vvvvvvv.vvvvvvv.vvvvvv........vxxxxxx +xxxxxxvv.....v..vvvvv.vvvvvvv.vvvvvvv.vvvvvvv.vvvvv..v.....vvxxxxxx +xxxxxxvvvv.vvvv.....................................vvvv.vvvvxxxxxx +xxxxxxvvv..vvvv.....................................vvvv..vvvxxxxxx +xxxxxxvvv.vvvvv......T.......(...{...[.......T......vvvvv.vvvxxxxxx +xxxxxxvvv..vvvv.....................................vvvv..vvvxxxxxx +xxxxxxvvvv.vvvv.....................................vvvv.vvvvxxxxxx +xxxxxxvv.....v..vvvvv.vvvvvvv.vvvvvvv.vvvvvvv.vvvvv..v.....vvxxxxxx +xxxxxxv........vvvvvv.vvvvvvv.vvvvvvv.vvvvvvv.vvvvvv........vxxxxxx +xxxxxxv..B....vvvvvvv.vvvvvvv.vvvvvvv.vvvvvvv.vvvvvvv....B..vxxxxxx +xxxxxxv.......vvvvv.....vvv.....vvv.....vvv.....vvvvv.......vxxxxxx +xxxxxxvv.....vvvvv.......v.......v.......v.......vvvvv.....vvxxxxxx +xxxxxxvvvvv.vvvvvv...B...v...B...v...B...v...B...vvvvvv.vvvvxxxxxxx +xxxxxxvvvvv...vvvvv.....vvv.....vvv.....vvv.....vvvvv...vvvvxxxxxxx +xxxxxxvvvvvvv.....vvv.vvvvvvv.vvvvvvv.vvvvvvv.vvv.....vvvvvvxxxxxxx +xxxxxxvvvvvvvvvvv.................................vvvvvvvvvvxxxxxxx +xxxxxxvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +ENDMAP + +########################################################################## +# Another temple (David Ploog) + +NAME: triangle_temple +PLACE: Temple +FLAGS: no_rotate +ORIENT: encompass + +MAP +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxlllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllxxxxxx +xxxxxxlllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllxxxxxx +xxxxxxlllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllxxxxxx +xxxxxxlllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllxxxxxx +xxxxxxlllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllxxxxxx +xxxxxxlllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllxxxxxx +xxxxxxlllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllxxxxxx +xxxxxxlllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllxxxxxx +xxxxxxlllllllllllllllllllllllllllll...lllllllllllllllllllllllllllllxxxxxx +xxxxxxlllllllllllllllllllllllllll.......lllllllllllllllllllllllllllxxxxxx +xxxxxxllllllllllllllllllllllllll.........llllllllllllllllllllllllllxxxxxx +xxxxxxlllllllllllllllllllllllll...........lllllllllllllllllllllllllxxxxxx +xxxxxxllllllllllllllllllllllll......{......llllllllllllllllllllllllxxxxxx +xxxxxxlllllllllllllllllllllll...............lllllllllllllllllllllllxxxxxx +xxxxxxllllllllllllllllllllll.................llllllllllllllllllllllxxxxxx +xxxxxxlllllllllllllllllllll......B.....B......lllllllllllllllllllllxxxxxx +xxxxxxllllllllllllllllllll.....................llllllllllllllllllllxxxxxx +xxxxxxlllllllllllllllllll.......................lllllllllllllllllllxxxxxx +xxxxxxllllllllllllllllll...B.................B...llllllllllllllllllxxxxxx +xxxxxxlllllllllllllllll.............B.............lllllllllllllllllxxxxxx +xxxxxxllllllllllllllll.............................llllllllllllllllxxxxxx +xxxxxxlllllllllllllll...............................lllllllllllllllxxxxxx +xxxxxxllllllllllllll.................................llllllllllllllxxxxxx +xxxxxxlllllllllllll.....B.......B.......B.......B.....lllllllllllllxxxxxx +xxxxxxllllllllllll.....................................llllllllllllxxxxxx +xxxxxxlllllllllll.......................................lllllllllllxxxxxx +xxxxxxllllllllll.........................................llllllllllxxxxxx +xxxxxxlllllllll....(.........B.............B.........[....lllllllllxxxxxx +xxxxxxllllllll......................B.....................lllllllllxxxxxx +xxxxxxllllllll............................................lllllllllxxxxxx +xxxxxxlllllllll..........................................llllllllllxxxxxx +xxxxxxlllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllxxxxxx +xxxxxxlllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllxxxxxx +xxxxxxlllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllxxxxxx +xxxxxxlllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllxxxxxx +xxxxxxlllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllxxxxxx +xxxxxxlllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllxxxxxx +xxxxxxlllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllxxxxxx +xxxxxxlllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx ENDMAP +########################################################################## +# Watery temple +NAME: water_temple +PLACE: Temple +FLAGS: no_rotate +ORIENT: encompass + +MAP +xcccccccccccccccccccccccccccccccccccccccccccccccccccx +xcwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwcx +xcwwwwwwwwwwww.........................wwwwwwwwwwwwcx +xcwwwwwwww.................................wwwwwwwwcx +xcwwwww...................B...................wwwwwcx +xcwww......B.............................B......wwwcx +xcwww.............B...............B.............wwwcx +xcww......................(......................wwcx +xcww.............................................wwcx +xcww...B..................T..................B...wwcx +xcww.............................................wwcx +xcww...................[.....{...................wwcx +xcwww.............B...............B.............wwwcx +xcwww......B.............................B......wwwcx +xcwwwww...................B...................wwwwwcx +xcwwwwwwww.................................wwwwwwwwcx +xcwwwwwwwwwwww.........................wwwwwwwwwwwwcx +xcwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwcx +xcccccccccccccccccccccccccccccccccccccccccccccccccccx +ENDMAP + + ############################################################################## # Tomb:1 diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc index 0d354cf287..ae2c75a3aa 100644 --- a/crawl-ref/source/delay.cc +++ b/crawl-ref/source/delay.cc @@ -215,6 +215,9 @@ void stop_delay( void ) default: break; } + + if (is_run_delay(delay.type)) + update_turn_count(); } bool you_are_delayed( void ) @@ -741,6 +744,7 @@ static void handle_run_delays(const delay_queue_item &delay) // We don't want to send the game into a deadlock. if (!you.running) { + update_turn_count(); pop_delay(); return; } @@ -769,7 +773,10 @@ static void handle_run_delays(const delay_queue_item &delay) // removed, remove it now. This is needed to clean up after // find_travel_pos() function in travel.cc. if (!you.running && is_run_delay(current_delay_action())) + { pop_delay(); + update_turn_count(); + } } static void handle_macro_delay() diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc index 9d510e9216..96a13a7352 100644 --- a/crawl-ref/source/output.cc +++ b/crawl-ref/source/output.cc @@ -57,6 +57,23 @@ static void dur_colour( int colour, bool running_out ) } } +void update_turn_count() +{ + // Don't update turn counter when running/resting/traveling to + // prevent pointless screen updates. + if (you.running > 0 || (you.running < 0 && Options.travel_delay == -1)) + return; + + // FIXME: Create some kind of layout manager class so we can + // templatise the heads-up display layout and stop hardcoding + // these coords. + gotoxy(61, 10); + textcolor(LIGHTGREY); + + // Show the turn count starting from 1. You can still quit on turn 0. + cprintf("%ld", you.num_turns); +} + void print_stats(void) { textcolor(LIGHTGREY); diff --git a/crawl-ref/source/output.h b/crawl-ref/source/output.h index 3025c8899d..6e65638ce9 100644 --- a/crawl-ref/source/output.h +++ b/crawl-ref/source/output.h @@ -14,15 +14,8 @@ #ifndef OUTPUT_H #define OUTPUT_H -// last updated 12may2000 {dlb} -/* *********************************************************************** - * called from: acr - player - stuff - * *********************************************************************** */ +void update_turn_count(); void print_stats(void); - -/* *********************************************************************** - * called from: chardump - * *********************************************************************** */ void get_full_detail(char* buffer, bool calc_unid); const char *equip_slot_to_name(int equip); diff --git a/crawl-ref/source/stuff.cc b/crawl-ref/source/stuff.cc index bb9c8214dd..255ac335e6 100644 --- a/crawl-ref/source/stuff.cc +++ b/crawl-ref/source/stuff.cc @@ -509,6 +509,7 @@ void redraw_screen(void) bool note_status = notes_are_active(); activate_notes(false); new_level(); + update_turn_count(); activate_notes(note_status); viewwindow(1, false); diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc index e19ae8555b..f5a1f109a3 100644 --- a/crawl-ref/source/view.cc +++ b/crawl-ref/source/view.cc @@ -1682,6 +1682,7 @@ void draw_border(void) gotoxy(40, 8); cprintf("Int:"); gotoxy(40, 9); cprintf("Dex:"); gotoxy(40, 10); cprintf("Gold:"); + gotoxy(55, 10); cprintf("Turn:"); gotoxy(40, 11); cprintf("Experience:"); gotoxy(40, 12); cprintf("Level"); } // end draw_border() -- cgit v1.2.3-54-g00ecf