diff options
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/acr.cc | 21 | ||||
| -rw-r--r-- | crawl-ref/source/fight.cc | 8 |
2 files changed, 22 insertions, 7 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index eccf7272c0..a873ddc5c9 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -2153,12 +2153,27 @@ void process_command( command_type cmd ) case CMD_INTERLEVEL_TRAVEL: if (Options.tut_travel) Options.tut_travel = 0; + if (!can_travel_interlevel()) { - mpr("Sorry, you can't auto-travel out of here."); - break; + if (you.running.x == you.x_pos && you.running.y == you.running.y) + { + mpr("You're already here."); + break; + } + else if (!you.running.x || !you.running.y) + { + mpr("Sorry, you can't auto-travel out of here."); + break; + } + + // Don't ask for a destination if you can only travel + // within level anyway. + start_travel(you.running.x, you.running.y); } - start_translevel_travel(); + else + start_translevel_travel(); + if (you.running) mesclr(); break; diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 952ba93e29..6b50831e1e 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -180,7 +180,7 @@ static int calc_your_to_hit_unarmed(int uattack = UNAT_NO_ATTACK, if (wearing_amulet(AMU_INACCURACY)) your_to_hit -= 5; - // vampires know how to bite and aim better when thirsty + // Vampires know how to bite and aim better when thirsty. if (you.species == SP_VAMPIRE && uattack == UNAT_BITE) { your_to_hit += 1; @@ -382,7 +382,7 @@ void melee_attack::init_attack() randart_wpn_properties( *weapon, art_props ); } - wpn_skill = weapon? weapon_skill( *weapon ) : SK_UNARMED_COMBAT; + wpn_skill = weapon ? weapon_skill( *weapon ) : SK_UNARMED_COMBAT; if (weapon) { hands = hands_reqd( *weapon, attacker->body_size() ); @@ -1073,8 +1073,8 @@ bool melee_attack::player_aux_unarmed() unarmed_attack = "bite"; simple_miss_message = true; - // TODO: Maybe unarmed combat factor in - aux_damage += player_mutation_level(MUT_FANGS) * 2; + aux_damage += player_mutation_level(MUT_FANGS) * 2 + + you.skills[SK_UNARMED_COMBAT] / 5; if (you.species == SP_VAMPIRE) { |