New key=value logfile format as proposed by Shawn Moore. This is more verbose

than the old format by about 2x, but is more maintainable and comprehensible.

Removed support for parsing scorefiles/logfiles older than 4.0 beta 26.

Added shim to make 0.1.7 logfiles compatible with 0.2

Using the -scorefile option alone (no -scores, -tscores, etc.) causes Crawl to
read in the existing scorefile/logfile and write it out to stdout in the new
format.

Ghouls get claw damage messages in unarmed combat.

Plain oozes lose acid damage attacks (added inadvertently).

Prompt the user when trying to displace a friendly over water (the old
fix was to simply say "The foo resists").

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@994 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 7 insertions, 2 deletions

diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index defd36c88f..835bdee2d8 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -693,7 +693,6 @@ bool melee_attack::player_aux_unarmed()
             }
 
             unarmed_attack = "punch";
-
             /* applied twice */
             aux_damage = 5 + you.skills[SK_UNARMED_COMBAT] / 3;
 
@@ -702,6 +701,12 @@ bool melee_attack::player_aux_unarmed()
                 unarmed_attack = "slash";
                 aux_damage += 6;
             }
+            else if (you.has_usable_claws())
+            {
+                unarmed_attack = "claw";
+                aux_damage += roll_dice(1, 3);
+            }
+
             break;
 
             /* To add more, add to while part of loop below as well */
@@ -1218,7 +1223,7 @@ int melee_attack::player_weapon_type_modify(int damage)
         break;
 
     case -1: // unarmed
-        if (you.species == SP_TROLL || you.mutation[MUT_CLAWS])
+        if (you.damage_type() == DVORP_CLAWING)
         {
             if (damage < HIT_MED)
                 attack_verb = "claw";