diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-02 15:57:03 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-02 15:57:03 +0000 |
| commit | d07c0fd21b74ac445ecdd955dbc627b459fd544d (patch) | |
| tree | dadef6d88b9238d50c35d820fb6726aca76b8ff4 | |
| parent | e0ca31828aef509c59b5eb4b6d43cb604d92b947 (diff) | |
| download | crawl-ref-d07c0fd21b74ac445ecdd955dbc627b459fd544d.tar.gz crawl-ref-d07c0fd21b74ac445ecdd955dbc627b459fd544d.zip | |
Reduce arena end-of-round delay, do arena LOS from current LOS center, not center of displayed grid (vgrdc can be different from glosc() if view_lock=no). Also fix monster behaviour to seek instead of wander in the arena.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8119 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | .gitignore | 7 | ||||
| -rw-r--r-- | crawl-ref/source/arena.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/view.cc | 2 |
4 files changed, 13 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index a1da29e4a0..64956ff1ae 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,13 @@ mapgen.log \#* TAGS +arena.result + +# Tile copied files +crawl-ref/source/dat/tiles/dngn.png +crawl-ref/source/dat/tiles/main.png +crawl-ref/source/dat/tiles/player.png + # The Crawl executable. crawl-ref/source/crawl diff --git a/crawl-ref/source/arena.cc b/crawl-ref/source/arena.cc index 977e71f303..2d66ba2c88 100644 --- a/crawl-ref/source/arena.cc +++ b/crawl-ref/source/arena.cc @@ -613,7 +613,7 @@ namespace arena do_fight(); if (trials_done < total_trials) - delay(Options.arena_delay * 8); + delay(Options.arena_delay * 5); } while (trials_done < total_trials); if (total_trials > 0) @@ -621,8 +621,8 @@ namespace arena mprf("Final score: %s (%d); %s (%d)", faction_a.desc.c_str(), team_a_wins, faction_b.desc.c_str(), trials_done - team_a_wins); - delay(Options.arena_delay * 8); } + delay(Options.arena_delay * 5); write_results(); } diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 9759f977e6..f1bd9a1856 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -1989,7 +1989,7 @@ static coord_def _random_monster_nearby_habitable_space(const monsters& mon, bool respect_los) { const bool respect_sanctuary = mons_wont_attack(&mon); - + coord_def target; int tries; { @@ -3566,6 +3566,8 @@ static void _handle_behaviour(monsters *mon) mon->foe = MHITNOT; if (mon->foe == MHITNOT || mon->foe == MHITYOU) _arena_set_foe(mon); + if (mon->behaviour == BEH_WANDER) + mon->behaviour = BEH_SEEK; return; } diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc index cdfe9217b7..84f5918797 100644 --- a/crawl-ref/source/view.cc +++ b/crawl-ref/source/view.cc @@ -5099,7 +5099,7 @@ void viewwindow(bool draw_it, bool do_updates) } else { - losight(env.show, grd, crawl_view.vgrdc); + losight(env.show, grd, crawl_view.glosc()); } #ifdef USE_TILE |