diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-08-03 09:45:16 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-08-03 09:45:16 +0000 |
| commit | 6ebcd3f73efb7cb08807bedd0524d1dfdd6db978 (patch) | |
| tree | d6892de9852312505e55de12d44e9fa1d5f8c41f | |
| parent | e0906f57dbf4de544ed6151e7218604e222411f8 (diff) | |
| download | crawl-ref-6ebcd3f73efb7cb08807bedd0524d1dfdd6db978.tar.gz crawl-ref-6ebcd3f73efb7cb08807bedd0524d1dfdd6db978.zip | |
* Fix infinite Xom teleportation rides. Whoops!
* Move unseen altar/entrance tiles to dngn.png, so they're handled
correctly with magic mapping.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10482 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/rltiles/dc-dngn.txt | 2 | ||||
| -rw-r--r-- | crawl-ref/source/rltiles/dc-misc.txt | 3 | ||||
| -rw-r--r-- | crawl-ref/source/tilepick.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/xom.cc | 4 |
4 files changed, 6 insertions, 7 deletions
diff --git a/crawl-ref/source/rltiles/dc-dngn.txt b/crawl-ref/source/rltiles/dc-dngn.txt index 67c9c86eb7..c40a5cd821 100644 --- a/crawl-ref/source/rltiles/dc-dngn.txt +++ b/crawl-ref/source/rltiles/dc-dngn.txt @@ -411,6 +411,7 @@ dngn_shallow_water_murky_disturbance DNGN_SHALLOW_WATER_MURKY_DISTURBANCE dngn_shallow_water_murky_disturbance2 %sdir dc-dngn/gateways +dngn_entrance DNGN_UNSEEN_ENTRANCE %rim 1 dngn_enter_hell DNGN_ENTER_HELL dngn_enter_zot_closed DNGN_ENTER_ZOT_CLOSED @@ -437,6 +438,7 @@ dngn_transit_pandemonium DNGN_TRANSIT_PANDEMONIUM %rim 0 %sdir dc-dngn/altars +dngn_altar DNGN_UNSEEN_ALTAR dngn_altar_zin DNGN_ALTAR_ZIN dngn_altar_shining_one DNGN_ALTAR_SHINING_ONE dngn_altar_kikubaaqudgha DNGN_ALTAR_KIKUBAAQUDGHA diff --git a/crawl-ref/source/rltiles/dc-misc.txt b/crawl-ref/source/rltiles/dc-misc.txt index 95cdeeb603..6c91ac4052 100644 --- a/crawl-ref/source/rltiles/dc-misc.txt +++ b/crawl-ref/source/rltiles/dc-misc.txt @@ -38,10 +38,7 @@ unseen_item UNSEEN_ITEM unseen_monster UNSEEN_CORPSE %corpse 0 %back none -dc-dngn/altars/dngn_altar UNSEEN_ALTAR -dc-dngn/gateways/dngn_entrance UNSEEN_ENTRANCE -%back none mask_deep_water MASK_DEEP_WATER mask_shallow_water MASK_SHALLOW_WATER mask_deep_water_murky MASK_DEEP_WATER_MURKY diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index 7e5afc1dcc..60a4406723 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -2671,7 +2671,7 @@ void tileidx_unseen(unsigned int &fg, unsigned int &bg, int ch, case '^': bg = TILE_DNGN_TRAP_ARROW; break; case '_': case 220: - case 131: fg = TILE_UNSEEN_ALTAR; break; + case 131: bg = TILE_DNGN_UNSEEN_ALTAR; break; case '{': case 247: case 135: bg = TILE_DNGN_DEEP_WATER; break; @@ -2682,7 +2682,7 @@ void tileidx_unseen(unsigned int &fg, unsigned int &bg, int ch, case 254: bg = TILE_DNGN_CLOSED_DOOR; break; case 129: bg = TILE_DNGN_RETURN; break; case 239: - case 132: fg = TILE_UNSEEN_ENTRANCE; break; + case 132: bg = TILE_DNGN_UNSEEN_ENTRANCE; break; case 136: bg = TILE_DNGN_ENTER; break; case 141: bg = TILE_DNGN_LAVA; break; } diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc index 0931a1ecb3..c1d0419e53 100644 --- a/crawl-ref/source/xom.cc +++ b/crawl-ref/source/xom.cc @@ -1700,7 +1700,7 @@ static bool _xom_is_good(int sever, int tension) if (one_chance_in(10)) break; } - while (x_chance_in_y(3, 4) || count > 7 + random2(5) + while (x_chance_in_y(3, 4) || count <= 7 + random2(5) || player_in_a_dangerous_place()); maybe_update_stashes(); @@ -2720,7 +2720,7 @@ static bool _xom_is_bad(int sever, int tension) you_teleport_now(false); more(); } - while (count > 7 + random2(5) + while (count <= 7 + random2(5) || x_chance_in_y(3, 4) && !player_in_a_dangerous_place()); badness = player_in_a_dangerous_place() ? 3 : 1; maybe_update_stashes(); |