From 7fad2c95c65fd2c31c75bbada22d05b2a1fe86cc Mon Sep 17 00:00:00 2001
From: BlackSheep <chris.terenzi@gmail.com>
Date: Fri, 6 Sep 2013 12:36:31 -0400
Subject: [PATCH] Make unarmed a valid newgame choice for all species

---
 crawl-ref/source/newgame.cc  | 8 ++------
 crawl-ref/source/ng-restr.cc | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc
index 96e45ea..3a9d4f8 100644
--- a/crawl-ref/source/newgame.cc
+++ b/crawl-ref/source/newgame.cc
@@ -1353,7 +1353,7 @@ static void _construct_weapon_menu(const weapon_type& defweapon,
         switch (weapons[i].first)
         {
         case WPN_UNARMED:
-            text += "claws";
+            text += weapons[i].second == CC_UNRESTRICTED ? "claws" : "unarmed";
             break;
         case WPN_JAVELINS:
             text += "javelins";
@@ -1468,7 +1468,7 @@ static void _construct_weapon_menu(const weapon_type& defweapon,
 
         text += defweapon == WPN_RANDOM  ? "Random" :
                 defweapon == WPN_VIABLE  ? "Viable" :
-                defweapon == WPN_UNARMED ? "claws"  :
+                defweapon == WPN_UNARMED ? "unarmed"  :
                 weapon_base_name(defweapon);
 
         // Adjust the end marker to aling the - because
@@ -1641,10 +1641,6 @@ static vector<weapon_choice> _get_weapons(const newgame_def* ng)
 
             switch (wp.first)
             {
-            case WPN_UNARMED:
-                if (!species_has_claws(ng->species))
-                    continue;
-                break;
             case WPN_SPEAR:
                 // Non-small fighters and gladiators get tridents.
                 if ((ng->job == JOB_FIGHTER || ng->job == JOB_GLADIATOR)
diff --git a/crawl-ref/source/ng-restr.cc b/crawl-ref/source/ng-restr.cc
index 416e12c..4916688 100644
--- a/crawl-ref/source/ng-restr.cc
+++ b/crawl-ref/source/ng-restr.cc
@@ -586,7 +586,7 @@ char_choice_restriction weapon_restriction(weapon_type wpn,
     case WPN_UNARMED:
         if (species_has_claws(ng.species))
             return CC_UNRESTRICTED;
-        return CC_BANNED;
+        return CC_RESTRICTED;
 
     case WPN_SHORT_SWORD:
         switch (ng.species)
-- 
1.8.1.2