diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-15 21:54:04 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-15 21:54:04 +0000 |
commit | 419037df3337c41f70d12818c780a52b691265d2 (patch) | |
tree | 1dc192b506c0644f171cc984e200b907773aa7a0 /crawl-ref/source | |
parent | 22fdbcb9d201b4b0e85ec76c14e4b337258fb612 (diff) | |
download | crawl-ref-419037df3337c41f70d12818c780a52b691265d2.tar.gz crawl-ref-419037df3337c41f70d12818c780a52b691265d2.zip |
Apply patch by zebez to add variants for a number of tiles (mostly
mirrored) as well as some nicer tiles for disturbance in water and the
entrance to Pan. Thanks!
Also, update commandline options help to use of species/job.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10228 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
21 files changed, 21 insertions, 12 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index e575977346..1d04eef458 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -296,8 +296,8 @@ static void _show_commandline_options_help() puts("Command line options:"); puts(" -help prints this list of options"); puts(" -name <string> character name"); - puts(" -race <arg> preselect race (by letter, abbreviation, or name)"); - puts(" -class <arg> preselect class (by letter, abbreviation, or name)"); + puts(" -species <arg> preselect race (by letter, abbreviation, or name)"); + puts(" -job <arg> preselect class (by letter, abbreviation, or name)"); puts(" -plain don't use IBM extended characters"); puts(" -dir <path> crawl directory"); puts(" -rc <file> init file name"); diff --git a/crawl-ref/source/rltiles/dc-dngn.txt b/crawl-ref/source/rltiles/dc-dngn.txt index 49ff833f36..b03ab03b63 100644 --- a/crawl-ref/source/rltiles/dc-dngn.txt +++ b/crawl-ref/source/rltiles/dc-dngn.txt @@ -387,12 +387,19 @@ floor/lava3 ## water dngn_open_sea DNGN_OPEN_SEA +dngn_open_sea2 dngn_deep_water DNGN_DEEP_WATER +dngn_deep_water2 dngn_shallow_water DNGN_SHALLOW_WATER +dngn_shallow_water2 dngn_shallow_water_disturbance DNGN_SHALLOW_WATER_DISTURBANCE +dngn_shallow_water_disturbance2 dngn_deep_water_murky DNGN_DEEP_WATER_MURKY +dngn_deep_water_murky2 dngn_shallow_water_murky DNGN_SHALLOW_WATER_MURKY +dngn_shallow_water_murky2 dngn_shallow_water_murky_disturbance DNGN_SHALLOW_WATER_MURKY_DISTURBANCE +dngn_shallow_water_murky_disturbance2 %rim 1 dngn_enter_hell DNGN_ENTER_HELL @@ -411,8 +418,6 @@ dngn_stone_arch DNGN_STONE_ARCH dngn_enter_pandemonium DNGN_ENTER_PANDEMONIUM dngn_portal DNGN_PORTAL dngn_portal_rotated -dngn_exit DNGN_EXIT_PANDEMONIUM -dngn_exit_flickering %rim 1 dngn_transit_pandemonium DNGN_TRANSIT_PANDEMONIUM %rim 0 @@ -441,8 +446,11 @@ dngn_altar_beogh DNGN_ALTAR_BEOGH %sdir dc-dngn dngn_blue_fountain DNGN_BLUE_FOUNTAIN +dngn_blue_fountain2 dngn_sparkling_fountain DNGN_SPARKLING_FOUNTAIN +dngn_sparkling_fountain2 dngn_blood_fountain DNGN_BLOOD_FOUNTAIN +dngn_blood_fountain2 dngn_dry_fountain DNGN_DRY_FOUNTAIN ## Miscellaneous entries that get drawn on the background. diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_blood_fountain2.png b/crawl-ref/source/rltiles/dc-dngn/dngn_blood_fountain2.png Binary files differnew file mode 100644 index 0000000000..9f11003b8c --- /dev/null +++ b/crawl-ref/source/rltiles/dc-dngn/dngn_blood_fountain2.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_blue_fountain2.png b/crawl-ref/source/rltiles/dc-dngn/dngn_blue_fountain2.png Binary files differnew file mode 100644 index 0000000000..46665b624a --- /dev/null +++ b/crawl-ref/source/rltiles/dc-dngn/dngn_blue_fountain2.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_deep_water2.png b/crawl-ref/source/rltiles/dc-dngn/dngn_deep_water2.png Binary files differnew file mode 100644 index 0000000000..65011585ed --- /dev/null +++ b/crawl-ref/source/rltiles/dc-dngn/dngn_deep_water2.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_deep_water_murky2.png b/crawl-ref/source/rltiles/dc-dngn/dngn_deep_water_murky2.png Binary files differnew file mode 100644 index 0000000000..288bbe67de --- /dev/null +++ b/crawl-ref/source/rltiles/dc-dngn/dngn_deep_water_murky2.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_pandemonium.png b/crawl-ref/source/rltiles/dc-dngn/dngn_enter_pandemonium.png Binary files differindex e399b99063..2d72ffad65 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_enter_pandemonium.png +++ b/crawl-ref/source/rltiles/dc-dngn/dngn_enter_pandemonium.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_entrance.png b/crawl-ref/source/rltiles/dc-dngn/dngn_entrance.png Binary files differindex 43a44129d8..d1489a7a15 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_entrance.png +++ b/crawl-ref/source/rltiles/dc-dngn/dngn_entrance.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_exit.png b/crawl-ref/source/rltiles/dc-dngn/dngn_exit.png Binary files differindex 45bad5f414..d5dbaf7740 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_exit.png +++ b/crawl-ref/source/rltiles/dc-dngn/dngn_exit.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_exit_flickering.png b/crawl-ref/source/rltiles/dc-dngn/dngn_exit_flickering.png Binary files differindex d3a73132e9..32d6781a67 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_exit_flickering.png +++ b/crawl-ref/source/rltiles/dc-dngn/dngn_exit_flickering.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_open_sea.png b/crawl-ref/source/rltiles/dc-dngn/dngn_open_sea.png Binary files differindex 468c9dd693..2a3893746f 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_open_sea.png +++ b/crawl-ref/source/rltiles/dc-dngn/dngn_open_sea.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_open_sea2.png b/crawl-ref/source/rltiles/dc-dngn/dngn_open_sea2.png Binary files differnew file mode 100644 index 0000000000..013d3f7eb9 --- /dev/null +++ b/crawl-ref/source/rltiles/dc-dngn/dngn_open_sea2.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_shallow_water2.png b/crawl-ref/source/rltiles/dc-dngn/dngn_shallow_water2.png Binary files differnew file mode 100644 index 0000000000..4f0ce929ae --- /dev/null +++ b/crawl-ref/source/rltiles/dc-dngn/dngn_shallow_water2.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_shallow_water_disturbance.png b/crawl-ref/source/rltiles/dc-dngn/dngn_shallow_water_disturbance.png Binary files differindex 55fea55e82..ec667735a5 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_shallow_water_disturbance.png +++ b/crawl-ref/source/rltiles/dc-dngn/dngn_shallow_water_disturbance.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_shallow_water_disturbance2.png b/crawl-ref/source/rltiles/dc-dngn/dngn_shallow_water_disturbance2.png Binary files differnew file mode 100644 index 0000000000..9f8f13bbd3 --- /dev/null +++ b/crawl-ref/source/rltiles/dc-dngn/dngn_shallow_water_disturbance2.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_shallow_water_murky2.png b/crawl-ref/source/rltiles/dc-dngn/dngn_shallow_water_murky2.png Binary files differnew file mode 100644 index 0000000000..6e2ad4300a --- /dev/null +++ b/crawl-ref/source/rltiles/dc-dngn/dngn_shallow_water_murky2.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_shallow_water_murky_disturbance.png b/crawl-ref/source/rltiles/dc-dngn/dngn_shallow_water_murky_disturbance.png Binary files differindex 75d75e96eb..254f1ecc61 100644 --- a/crawl-ref/source/rltiles/dc-dngn/dngn_shallow_water_murky_disturbance.png +++ b/crawl-ref/source/rltiles/dc-dngn/dngn_shallow_water_murky_disturbance.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_shallow_water_murky_disturbance2.png b/crawl-ref/source/rltiles/dc-dngn/dngn_shallow_water_murky_disturbance2.png Binary files differnew file mode 100644 index 0000000000..3278b32091 --- /dev/null +++ b/crawl-ref/source/rltiles/dc-dngn/dngn_shallow_water_murky_disturbance2.png diff --git a/crawl-ref/source/rltiles/dc-dngn/dngn_sparkling_fountain2.png b/crawl-ref/source/rltiles/dc-dngn/dngn_sparkling_fountain2.png Binary files differnew file mode 100644 index 0000000000..444e9c3d29 --- /dev/null +++ b/crawl-ref/source/rltiles/dc-dngn/dngn_sparkling_fountain2.png diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index 82b9861d55..7d84d9d956 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -2388,7 +2388,7 @@ int tileidx_feature(int object, int gx, int gy) monsters *mon = &menv[mgrd[gx][gy]]; // Add disturbance to tile. if (mons_is_submerged(mon)) - t++; + t+=2; } return (t); } @@ -2433,13 +2433,12 @@ int tileidx_feature(int object, int gx, int gy) return TILE_DNGN_ENTER_ABYSS; case DNGN_EXIT_ABYSS: case DNGN_EXIT_HELL: + case DNGN_EXIT_PANDEMONIUM: return TILE_DNGN_EXIT_ABYSS; case DNGN_STONE_ARCH: return TILE_DNGN_STONE_ARCH; case DNGN_ENTER_PANDEMONIUM: return TILE_DNGN_ENTER_PANDEMONIUM; - case DNGN_EXIT_PANDEMONIUM: - return TILE_DNGN_EXIT_PANDEMONIUM; case DNGN_TRANSIT_PANDEMONIUM: return TILE_DNGN_TRANSIT_PANDEMONIUM; case DNGN_ENTER_ORCISH_MINES: diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc index 28158b4a97..c1351c525f 100644 --- a/crawl-ref/source/tilereg.cc +++ b/crawl-ref/source/tilereg.cc @@ -267,11 +267,11 @@ void DungeonRegion::pack_background(unsigned int bg, int x, int y) } m_buf_dngn.add(bg_idx, x, y); - if (bg & TILE_FLAG_WAS_SECRET) - m_buf_dngn.add(TILE_DNGN_DETECTED_SECRET_DOOR, x, y); - if (bg_idx > TILE_DNGN_UNSEEN) { + if (bg & TILE_FLAG_WAS_SECRET) + m_buf_dngn.add(TILE_DNGN_DETECTED_SECRET_DOOR, x, y); + if (bg & TILE_FLAG_BLOOD) { tile_flavour &flv = env.tile_flv[x + m_cx_to_gx][y + m_cy_to_gy]; @@ -860,9 +860,11 @@ void DungeonRegion::pack_foreground(unsigned int bg, unsigned int fg, int x, int { if (tile_dngn_equal(TILE_DNGN_LAVA, bg_idx)) m_buf_main.add(TILE_MASK_LAVA, x, y); - else if (tile_dngn_equal(TILE_DNGN_SHALLOW_WATER, bg_idx)) + else if (tile_dngn_equal(TILE_DNGN_SHALLOW_WATER, bg_idx) || + tile_dngn_equal(TILE_DNGN_SHALLOW_WATER_DISTURBANCE, bg_idx)) m_buf_main.add(TILE_MASK_SHALLOW_WATER, x, y); - else if (tile_dngn_equal(TILE_DNGN_SHALLOW_WATER_MURKY, bg_idx)) + else if (tile_dngn_equal(TILE_DNGN_SHALLOW_WATER_MURKY, bg_idx) || + tile_dngn_equal(TILE_DNGN_SHALLOW_WATER_MURKY_DISTURBANCE, bg_idx)) m_buf_main.add(TILE_MASK_SHALLOW_WATER_MURKY, x, y); else if (tile_dngn_equal(TILE_DNGN_DEEP_WATER, bg_idx)) m_buf_main.add(TILE_MASK_DEEP_WATER, x, y); |