summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crawl-ref/source/dungeon.cc5
-rw-r--r--crawl-ref/source/hiscores.cc3
2 files changed, 6 insertions, 2 deletions
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index 1ef6ed9e82..8ba0e62374 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -4222,9 +4222,10 @@ static void builder_extras( int level_number, int level_type )
}
}
- if (level_number > 5 && one_chance_in(10))
+ if (level_number > 6 && one_chance_in(10))
{
- many_pools( (coinflip() ? DNGN_DEEP_WATER : DNGN_LAVA) );
+ many_pools( level_number < 11 || coinflip() ?
+ DNGN_DEEP_WATER : DNGN_LAVA );
return;
}
diff --git a/crawl-ref/source/hiscores.cc b/crawl-ref/source/hiscores.cc
index 2aa17937c2..ee25955bbb 100644
--- a/crawl-ref/source/hiscores.cc
+++ b/crawl-ref/source/hiscores.cc
@@ -1835,6 +1835,7 @@ scorefile_entry::death_description(death_desc_verbosity verbosity) const
std::string beam = terse_missile_name();
if (beam.empty())
beam = terse_beam_cause();
+ trim_string(beam);
if (!beam.empty())
desc += make_stringf(" (%s)", beam.c_str());
}
@@ -2128,6 +2129,8 @@ scorefile_entry::death_description(death_desc_verbosity verbosity) const
desc += scratch;
needs_damage = true;
}
+ else
+ desc += make_stringf(" (%s)", auxkilldata.c_str());
}
else if (needs_beam_cause_line)
{