diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-19 20:45:51 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-19 20:45:51 +0000 |
commit | c4459f06231f7aaf1a35cdab56c3419dff6073df (patch) | |
tree | 2a2ae01555c3327be22a183cc2bb37d2b926331b | |
parent | cc5863ffc58f4058d97a392248cef63cf6a4f544 (diff) | |
download | crawl-ref-c4459f06231f7aaf1a35cdab56c3419dff6073df.tar.gz crawl-ref-c4459f06231f7aaf1a35cdab56c3419dff6073df.zip |
Move all tiles for stairs, gates and portals into a new subfolder
dc-dngn/gateways/.
Also prompt for randomly rolled unnamed characters.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10338 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r-- | crawl-ref/source/misc.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/newgame.cc | 43 | ||||
-rw-r--r-- | crawl-ref/source/rltiles/dc-dngn.txt | 4 | ||||
-rw-r--r-- | crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter.png (renamed from crawl-ref/source/rltiles/dc-dngn/dngn_enter.png) | bin | 648 -> 648 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_abyss.png (renamed from crawl-ref/source/rltiles/dc-dngn/dngn_enter_abyss.png) | bin | 989 -> 989 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_cocytus.png (renamed from crawl-ref/source/rltiles/dc-dngn/dngn_enter_cocytus.png) | bin | 895 -> 895 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_dis.png (renamed from crawl-ref/source/rltiles/dc-dngn/dngn_enter_dis.png) | bin | 783 -> 783 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_gehenna.png (renamed from crawl-ref/source/rltiles/dc-dngn/dngn_enter_gehenna.png) | bin | 821 -> 821 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_hell.png (renamed from crawl-ref/source/rltiles/dc-dngn/dngn_enter_hell.png) | bin | 677 -> 677 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_labyrinth.png (renamed from crawl-ref/source/rltiles/dc-dngn/dngn_enter_labyrinth.png) | bin | 909 -> 909 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_pandemonium.png (renamed from crawl-ref/source/rltiles/dc-dngn/dngn_enter_pandemonium.png) | bin | 812 -> 812 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_tartarus.png (renamed from crawl-ref/source/rltiles/dc-dngn/dngn_enter_tartarus.png) | bin | 932 -> 932 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_zot_closed.png (renamed from crawl-ref/source/rltiles/dc-dngn/dngn_enter_zot_closed.png) | bin | 1072 -> 1072 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_zot_open.png (renamed from crawl-ref/source/rltiles/dc-dngn/dngn_enter_zot_open.png) | bin | 743 -> 743 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/dc-dngn/gateways/dngn_entrance.png (renamed from crawl-ref/source/rltiles/dc-dngn/dngn_entrance.png) | bin | 773 -> 773 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/dc-dngn/gateways/dngn_exit.png (renamed from crawl-ref/source/rltiles/dc-dngn/dngn_exit.png) | bin | 891 -> 891 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/dc-dngn/gateways/dngn_exit_flickering.png (renamed from crawl-ref/source/rltiles/dc-dngn/dngn_exit_flickering.png) | bin | 914 -> 914 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/dc-dngn/gateways/dngn_portal.png (renamed from crawl-ref/source/rltiles/dc-dngn/dngn_portal.png) | bin | 1593 -> 1593 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/dc-dngn/gateways/dngn_portal_rotated.png (renamed from crawl-ref/source/rltiles/dc-dngn/dngn_portal_rotated.png) | bin | 1615 -> 1615 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/dc-dngn/gateways/dngn_return.png (renamed from crawl-ref/source/rltiles/dc-dngn/dngn_return.png) | bin | 649 -> 649 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/dc-dngn/gateways/dngn_stone_arch.png (renamed from crawl-ref/source/rltiles/dc-dngn/dngn_stone_arch.png) | bin | 729 -> 729 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/dc-dngn/gateways/dngn_transit_pandemonium.png (renamed from crawl-ref/source/rltiles/dc-dngn/dngn_transit_pandemonium.png) | bin | 619 -> 619 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/dc-dngn/gateways/escape_hatch_down.png (renamed from crawl-ref/source/rltiles/dc-dngn/escape_hatch_down.png) | bin | 897 -> 897 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/dc-dngn/gateways/escape_hatch_up.png (renamed from crawl-ref/source/rltiles/dc-dngn/escape_hatch_up.png) | bin | 1023 -> 1023 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/dc-dngn/gateways/stone_stairs_down.png (renamed from crawl-ref/source/rltiles/dc-dngn/stone_stairs_down.png) | bin | 754 -> 754 bytes | |||
-rw-r--r-- | crawl-ref/source/rltiles/dc-dngn/gateways/stone_stairs_up.png (renamed from crawl-ref/source/rltiles/dc-dngn/stone_stairs_up.png) | bin | 635 -> 635 bytes |
26 files changed, 26 insertions, 23 deletions
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index d55807f0ea..5c98c97a4e 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -1687,7 +1687,7 @@ static bool _stair_moves_pre(dungeon_feature_type stair) static bool _check_carrying_orb() { - // We never picked up the Orb, all's okay. + // We never picked up the Orb, no problem. if (you.char_direction != GDT_ASCENDING) return (true); diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc index 34c122a86a..2c3b334527 100644 --- a/crawl-ref/source/newgame.cc +++ b/crawl-ref/source/newgame.cc @@ -1219,6 +1219,28 @@ game_start: strcpy( you.class_name, get_class_name(you.char_class) ); + if (Options.random_pick) + { + // For completely random combinations (!, #, or Options.random_pick) + // reroll characters until the player accepts one of them or quits. + clrscr(); + + std::string specs = species_name(you.species, you.experience_level); + if (specs.length() > 79) + specs = specs.substr(0, 79); + + cprintf( "You are a%s %s %s." EOL, + (is_vowel( specs[0] )) ? "n" : "", specs.c_str(), + you.class_name ); + + cprintf(EOL "Do you want to play this combination? (ynq) [y]"); + char c = getch(); + if (c == ESCAPE || tolower(c) == 'q') + end(0); + if (tolower(c) == 'n') + goto game_start; + } + // New: pick name _after_ race and class choices. if (you.your_name[0] == 0) { @@ -1250,27 +1272,6 @@ game_start: } } } - else if (Options.random_pick) - { - // For completely random combinations (!, #, or Options.random_pick) - // reroll characters until the player accepts one of them or quits. - clrscr(); - - std::string specs = species_name(you.species, you.experience_level); - if (specs.length() > 79) - specs = specs.substr(0, 79); - - cprintf( "You are a%s %s %s." EOL, - (is_vowel( specs[0] )) ? "n" : "", specs.c_str(), - you.class_name ); - - cprintf(EOL "Do you want to play this combination? (ynq) [y]"); - char c = getch(); - if (c == ESCAPE || tolower(c) == 'q') - end(0); - if (tolower(c) == 'n') - goto game_start; - } // ************ Round-out character statistics and such. ************ diff --git a/crawl-ref/source/rltiles/dc-dngn.txt b/crawl-ref/source/rltiles/dc-dngn.txt index 2ca3801855..0d95b38b37 100644 --- a/crawl-ref/source/rltiles/dc-dngn.txt +++ b/crawl-ref/source/rltiles/dc-dngn.txt @@ -351,6 +351,7 @@ dngn_trap_teleport DNGN_TRAP_TELEPORT dngn_trap_zot DNGN_TRAP_ZOT ## stairs +%sdir dc-dngn/gateways stone_stairs_down DNGN_STONE_STAIRS_DOWN stone_stairs_up DNGN_STONE_STAIRS_UP escape_hatch_down DNGN_ESCAPE_HATCH_DOWN @@ -409,12 +410,12 @@ dngn_shallow_water_murky2 dngn_shallow_water_murky_disturbance DNGN_SHALLOW_WATER_MURKY_DISTURBANCE dngn_shallow_water_murky_disturbance2 +%sdir dc-dngn/gateways %rim 1 dngn_enter_hell DNGN_ENTER_HELL dngn_enter_zot_closed DNGN_ENTER_ZOT_CLOSED dngn_enter_zot_open DNGN_ENTER_ZOT_OPEN %rim 0 -dngn_enter_labyrinth DNGN_ENTER_LABYRINTH dngn_enter_dis DNGN_ENTER_DIS dngn_enter_gehenna DNGN_ENTER_GEHENNA dngn_enter_cocytus DNGN_ENTER_COCYTUS @@ -425,6 +426,7 @@ dngn_exit DNGN_EXIT_ABYSS dngn_exit_flickering dngn_stone_arch DNGN_STONE_ARCH +dngn_enter_labyrinth DNGN_ENTER_LABYRINTH dngn_enter_pandemonium DNGN_ENTER_PANDEMONIUM dngn_portal DNGN_PORTAL dngn_portal_rotated diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_enter.png b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter.png Binary files differindex 27821aff65..27821aff65 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_enter.png +++ b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_abyss.png b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_abyss.png Binary files differindex 17397e043a..17397e043a 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_abyss.png +++ b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_abyss.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_cocytus.png b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_cocytus.png Binary files differindex 9d5f28c84c..9d5f28c84c 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_cocytus.png +++ b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_cocytus.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_dis.png b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_dis.png Binary files differindex 8b0461df87..8b0461df87 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_dis.png +++ b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_dis.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_gehenna.png b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_gehenna.png Binary files differindex 8180dab466..8180dab466 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_gehenna.png +++ b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_gehenna.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_hell.png b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_hell.png Binary files differindex b1c2c4b481..b1c2c4b481 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_hell.png +++ b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_hell.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_labyrinth.png b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_labyrinth.png Binary files differindex 6cd270b185..6cd270b185 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_labyrinth.png +++ b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_labyrinth.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_pandemonium.png b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_pandemonium.png Binary files differindex 2d72ffad65..2d72ffad65 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_pandemonium.png +++ b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_pandemonium.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_tartarus.png b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_tartarus.png Binary files differindex c15dadc4e2..c15dadc4e2 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_tartarus.png +++ b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_tartarus.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_zot_closed.png b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_zot_closed.png Binary files differindex 3d163d39d5..3d163d39d5 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_zot_closed.png +++ b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_zot_closed.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_zot_open.png b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_zot_open.png Binary files differindex f50faa176d..f50faa176d 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_zot_open.png +++ b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_enter_zot_open.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_entrance.png b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_entrance.png Binary files differindex d1489a7a15..d1489a7a15 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_entrance.png +++ b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_entrance.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_exit.png b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_exit.png Binary files differindex d5dbaf7740..d5dbaf7740 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_exit.png +++ b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_exit.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_exit_flickering.png b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_exit_flickering.png Binary files differindex 32d6781a67..32d6781a67 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_exit_flickering.png +++ b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_exit_flickering.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_portal.png b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_portal.png Binary files differindex af364d12ed..af364d12ed 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_portal.png +++ b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_portal.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_portal_rotated.png b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_portal_rotated.png Binary files differindex 3dd824c48a..3dd824c48a 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_portal_rotated.png +++ b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_portal_rotated.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_return.png b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_return.png Binary files differindex 3f71739824..3f71739824 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_return.png +++ b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_return.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_stone_arch.png b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_stone_arch.png Binary files differindex 6b3cacf015..6b3cacf015 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_stone_arch.png +++ b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_stone_arch.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_transit_pandemonium.png b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_transit_pandemonium.png Binary files differindex f0a06d0764..f0a06d0764 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_transit_pandemonium.png +++ b/crawl-ref/source/rltiles/dc-dngn/gateways/dngn_transit_pandemonium.png diff --git a/crawl-ref/source/rltiles/dc-dngn/escape_hatch_down.png b/crawl-ref/source/rltiles/dc-dngn/gateways/escape_hatch_down.png Binary files differindex 6a2e4f222e..6a2e4f222e 100644 --- a/crawl-ref/source/rltiles/dc-dngn/escape_hatch_down.png +++ b/crawl-ref/source/rltiles/dc-dngn/gateways/escape_hatch_down.png diff --git a/crawl-ref/source/rltiles/dc-dngn/escape_hatch_up.png b/crawl-ref/source/rltiles/dc-dngn/gateways/escape_hatch_up.png Binary files differindex 99095652b1..99095652b1 100644 --- a/crawl-ref/source/rltiles/dc-dngn/escape_hatch_up.png +++ b/crawl-ref/source/rltiles/dc-dngn/gateways/escape_hatch_up.png diff --git a/crawl-ref/source/rltiles/dc-dngn/stone_stairs_down.png b/crawl-ref/source/rltiles/dc-dngn/gateways/stone_stairs_down.png Binary files differindex 563ff09551..563ff09551 100644 --- a/crawl-ref/source/rltiles/dc-dngn/stone_stairs_down.png +++ b/crawl-ref/source/rltiles/dc-dngn/gateways/stone_stairs_down.png diff --git a/crawl-ref/source/rltiles/dc-dngn/stone_stairs_up.png b/crawl-ref/source/rltiles/dc-dngn/gateways/stone_stairs_up.png Binary files differindex b899ed425c..b899ed425c 100644 --- a/crawl-ref/source/rltiles/dc-dngn/stone_stairs_up.png +++ b/crawl-ref/source/rltiles/dc-dngn/gateways/stone_stairs_up.png |