From be4cf364b3216c9d96423fdda12388ea1b966102 Mon Sep 17 00:00:00 2001
From: hoge <hoge@0568b783-4c39-0410-ac80-bf13821ea2a2>
Date: Sat, 23 Mar 2002 14:15:24 +0000
Subject: [PATCH] =?utf8?q?=EF=BD=A5=E7=AD=B5=EE=8A=98=EF=BD=B9=EF=BD=A5?=
 =?utf8?q?=EF=BD=BF=EF=BD=A1=EF=BD=BC=EF=BD=A4=EF=BE=8EHUMAN=EF=BD=A5?=
 =?utf8?q?=EF=BE=95=EF=BD=A5=E9=AC=A3=EF=BD=B0=EF=BD=A4=EF=BE=88=EF=BD=A5?=
 =?utf8?q?=EF=BD=A2=EF=BD=A5=EF=BD=A4=EF=BD=A5=EF=BE=86=EF=BD=A5=E7=88=A8?=
 =?utf8?q?=EF=BE=8ESLAY=5FHUMAN=20=EF=BE=82=EF=BD=BC=EF=BE=80=EF=BD=B5?=
 =?utf8?q?=EF=BD=A4=EF=BE=88=EF=BD=A5=EF=BE=81=EF=BD=A5=EF=BD=A7=EF=BD=A5?=
 =?utf8?q?=EE=8A=98=EF=BD=BD=EF=BD=A1=EF=BD=BC=EF=BD=A4=EF=BE=8FSLAY=5FHUM?=
 =?utf8?q?AN=EF=BD=A4=EF=BE=84=EF=BD=A4=EF=BD=B1=EF=BD=A4=EF=BD=BF?=
 =?utf8?q?=EF=BD=A4=EF=BE=8E=EF=BD=A4=EF=BE=87=EF=BD=B6=EF=BD=AF=EF=BD=A4?=
 =?utf8?q?=EF=BD=B5=EF=BD=A4=EE=87=AF=EF=BD=AB=EF=BE=84=EF=BD=BE=EF=BD=A4?=
 =?utf8?q?=EF=BD=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 lib/edit/a_info_j.txt |  43 ++++----
 lib/edit/e_info_j.txt |   6 +-
 lib/edit/r_info_j.txt | 278 +++++++++++++++++++++++++-------------------------
 src/artifact.c        |  13 ++-
 src/birth.c           |   2 +
 src/bldg.c            |   2 +
 src/cmd1.c            |  20 +++-
 src/cmd2.c            |  12 +++
 src/cmd3.c            |   2 +
 src/cmd5.c            |   2 +-
 src/cmd6.c            |   6 +-
 src/defines.h         |   8 +-
 src/files.c           |   2 +-
 src/hissatsu.c        |  12 +--
 src/init1.c           |   6 +-
 src/melee2.c          |   4 +-
 src/monster1.c        |  12 ++-
 src/object1.c         |   9 ++
 src/object2.c         |   5 +
 src/spells2.c         |   9 ++
 src/spells3.c         |  11 +-
 src/wizard1.c         |  10 +-
 22 files changed, 284 insertions(+), 190 deletions(-)

diff --git a/lib/edit/a_info_j.txt b/lib/edit/a_info_j.txt
index 1c404fbfe..1556359cd 100644
--- a/lib/edit/a_info_j.txt
+++ b/lib/edit/a_info_j.txt
@@ -1205,7 +1205,7 @@ E:of Caine
 I:23:4:4
 W:20:80:12:125000
 P:0:2d4:10:15:5
-F:DEX | HIDE_TYPE | STEALTH | SEARCH |
+F:DEX | HIDE_TYPE | STEALTH | SEARCH | SLAY_HUMAN |
 F:SLAY_EVIL | SLAY_TROLL | SLAY_ORC | BRAND_POIS |
 F:FREE_ACT | RES_DARK | SUST_DEX | SEE_INVIS | SHOW_MODS | THROW
 D:¥¢¥ó¥Ð¡¼¤Î´ÏÂâ¤ò»Ø´ø¤¹¤ë¥±¥¤¥ó¤Î¥À¥¬¡¼¤À¡£
@@ -1289,7 +1289,7 @@ I:23:21:5
 W:30:15:140:100000
 P:0:5d4:-20:20:0
 F:CON | HIDE_TYPE |
-F:KILL_DRAGON | SLAY_EVIL | SLAY_DEMON | SLAY_TROLL | RES_DISEN |
+F:KILL_DRAGON | SLAY_EVIL | SLAY_DEMON | SLAY_TROLL | RES_DISEN | SLAY_HUMAN |
 F:AGGRAVATE | CURSED | HEAVY_CURSE | SHOW_MODS
 D:$This sword has runes of power incused on its ornate hint, and a single 
 D:$blood channel that gleams coldly blue as you grasp this mighty weapon of 
@@ -1442,7 +1442,7 @@ E:'Zarcuthra'
 I:23:25:4
 W:30:180:250:205000
 P:0:4d6:19:21:0
-F:STR | CHR | INFRA | HIDE_TYPE | VORPAL | XTRA_RES_OR_POWER |
+F:STR | CHR | INFRA | HIDE_TYPE | VORPAL | XTRA_RES_OR_POWER | SLAY_HUMAN |
 F:KILL_DRAGON | SLAY_ANIMAL | SLAY_EVIL | BRAND_FIRE | LITE |
 F:SLAY_UNDEAD | SLAY_DEMON | SLAY_TROLL | SLAY_GIANT | SLAY_ORC |
 F:RES_FIRE | RES_CONF | RES_CHAOS | FREE_ACT | SEE_INVIS | AGGRAVATE |
@@ -1494,7 +1494,7 @@ I:23:28:0
 W:40:15:260:111000
 P:0:4d5:18:19:0
 F:SLAY_DRAGON | SLAY_EVIL | SLAY_UNDEAD | SLAY_TROLL | SLAY_GIANT |
-F:SLAY_ORC | SEE_INVIS | SHOW_MODS | VORPAL | BRAND_POIS
+F:SLAY_HUMAN | SLAY_ORC | SEE_INVIS | SHOW_MODS | VORPAL | BRAND_POIS
 D:$A giant's weapon, with a long blade tall and straight thrusting out from a 
 D:$massive double-pronged hint.  On its blade are written doomspells against 
 D:$both the living and undead.
@@ -1591,11 +1591,11 @@ D:
 #JZ# ¥¸¥§¥¤¥½¥ó¤Ç¤¹¤Í
 N:85:¡Ø¥Á¥§¥ó¥½¡¼¡Ù
 E:'Chainsword'
-I:23:16:2
+I:23:16:-2
 W:50:50:130:66666
 P:0:11d5:-30:7:0
-F:DEX | CHR | STEALTH | HIDE_TYPE | SPEED | AGGRAVATE | BLOWS | VORPAL |
-F:SLAY_TROLL | SLAY_ORC | SEE_INVIS | SHOW_MODS
+F:DEX | CHR | STEALTH | HIDE_TYPE | SPEED | AGGRAVATE | VORPAL |
+F:SLAY_HUMAN | SLAY_TROLL | SLAY_ORC | SEE_INVIS | SHOW_MODS
 D:»ý¤Ã¤¿¼Ô¤ò»¦Ù¤¥Þ¥·¡¼¥ó¤ËÊѤ¨¤ë¼ö¤ï¤ì¤¿·õ¤À¡£¤¢¤Ê¤¿¤Ë¤Ï¤³¤Î·õ¤Î
 D:·ì¤Ëµ²¤¨¤¿¶«¤Ó¤¬Ê¹¤³¤¨¤ë¤À¤í¤¦¡£
 
@@ -1622,7 +1622,7 @@ E:'Careth Asdriag'
 I:23:11:1
 W:15:8:50:25000
 P:0:1d7:6:8:0
-F:BLOWS | SLAY_DRAGON | SLAY_ANIMAL | SLAY_TROLL | SLAY_GIANT |
+F:BLOWS | SLAY_DRAGON | SLAY_ANIMAL | SLAY_TROLL | SLAY_GIANT | SLAY_HUMAN |
 F:SLAY_ORC | SHOW_MODS | RIDING
 D:$An heirloom of the Lords of Rhun far to the east, and a name of 
 D:$dismay to creatures natural and unnatural.
@@ -1690,7 +1690,7 @@ P:0:6d5:18:28:-50
 F:KILL_DRAGON | SLAY_ANIMAL | SLAY_EVIL | BRAND_COLD | SLAY_TROLL |
 F:SLAY_ORC | FREE_ACT | RES_ACID | RES_ELEC | RES_FIRE | RES_COLD |
 F:RES_CONF | RES_CHAOS | SEE_INVIS | TELEPATHY | AGGRAVATE | SHOW_MODS |
-F:CHAOTIC | VORPAL | BRAND_FIRE | BRAND_POIS | LITE
+F:SLAY_HUMAN | CHAOTIC | VORPAL | BRAND_FIRE | BRAND_POIS | LITE
 D:$This weapon of wrath, cursed with a violent anger, dives hungrily 
 D:$into the flesh of its enemies. It gathers shadows of death into its 
 D:$owner as they inflict wounds that will never heal.
@@ -2081,7 +2081,7 @@ P:0:9d9:5:25:10
 F:KILL_DRAGON | SLAY_ANIMAL | SLAY_EVIL | IMPACT | SLAY_UNDEAD | NO_MAGIC |
 F:SLAY_DEMON | SLAY_TROLL | SLAY_ORC | RES_ACID | RES_ELEC | RES_FIRE |
 F:RES_COLD | SEE_INVIS | TELEPATHY | AGGRAVATE | SHOW_MODS | INSTA_ART |
-F:RIDING | QUESTITEM
+F:SLAY_HUMAN | RIDING | QUESTITEM
 D:$The mighty Hammer of the Underworld, blackened by doomspells of shattering, 
 D:$whose wielder holds the lives of all Morgoth's servants in his hand.
 D:¤¢¤é¤æ¤ëʪ¤òÊ´ºÕ¤¹¤ë°Å¹õËâË¡¤Ë¤è¤ê¹õ¤¯µ±¤¯
@@ -2130,9 +2130,9 @@ D:
 N:114:¡Ø·ìή¤Î»É¡Ù
 E:'Bloodspike'
 I:21:12:4
-W:20:30:150:30000
+W:20:30:150:50000
 P:0:2d6:8:22:0
-F:STR | HIDE_TYPE |
+F:STR | HIDE_TYPE | SLAY_HUMAN |
 F:SLAY_ANIMAL | SLAY_TROLL | SLAY_ORC | RES_NEXUS | SEE_INVIS |
 F:SHOW_MODS
 D:$You feel strong and firm of foot as you whip the chain-suspended spiked orb 
@@ -2254,7 +2254,7 @@ E:'Deathwreaker'
 I:21:20:6
 W:80:38:400:444444
 P:0:7d8:18:18:0
-F:STR | TUNNEL | HIDE_TYPE | NO_TELE |
+F:STR | TUNNEL | HIDE_TYPE | NO_TELE | SLAY_HUMAN |
 F:SLAY_DRAGON | SLAY_ANIMAL | SLAY_EVIL | SLAY_UNDEAD | BRAND_FIRE |
 F:IM_FIRE | RES_DARK | RES_CONF | RES_CHAOS | RES_DISEN | AGGRAVATE | 
 F:LITE | SHOW_MODS | BRAND_POIS | VAMPIRIC | RIDING
@@ -2294,7 +2294,7 @@ E:'Slayer'
 I:23:28:2
 W:30:60:260:200000
 P:0:4d5:15:15:0
-F:BLOWS | VAMPIRIC | HOLD_LIFE | SLAY_UNDEAD | SLAY_EVIL |
+F:BLOWS | VAMPIRIC | HOLD_LIFE | SLAY_UNDEAD | SLAY_EVIL | SLAY_HUMAN |
 F:REGEN | RES_FEAR | RES_BLIND | SLOW_DIGEST | SHOW_MODS
 D:¿ô¤¨ÀÚ¤ì¤Ê¤¤¤Û¤É¤Î¼ó¤òÍ¤Æ¤­¤¿¤³¤Î·ì¤Ëµ²¤¨¤¿¿Ï¤Ï
 D:Ũ¤Î·ì¤Èº²¤òµÛ¤Ã¤Æ¼ê¤Ë¤¹¤ë¼Ô¤ÎÂΤòÌþ¤¹¡£
@@ -2583,10 +2583,10 @@ D:
 
 N:144:¡Ø¼Àµ¡Ù
 E:'Muramasa'
-I:23:20:3
+I:23:20:2
 W:60:200:200:1000000
 P:0:10d5:0:0:-20
-F:HIDE_TYPE | BLOWS | VORPAL | VAMPIRIC |
+F:HIDE_TYPE | BLOWS | VORPAL | VAMPIRIC | SLAY_HUMAN |
 F:SHOW_MODS | SPEED | ACTIVATE | RES_DISEN | NO_TELE |
 F:DRAIN_EXP | AGGRAVATE | RES_DARK | RES_NETHER | TY_CURSE |
 D:¡ÖËâʪ¤ËÁø¤¦¤Æ¤ÏËâʪ¤ò»Â¤ê¡¢¿À¤ËÁø¤¦¤Æ¤Ï¿À¤ò»Â¤ë¡£¡×
@@ -2691,7 +2691,7 @@ E:'Soulcrusher'
 I:23:30:4
 W:70:25:180:250000
 P:0:6d5:20:15:0
-F:SLAY_DEMON | STR | CON | SLAY_UNDEAD | BRAND_FIRE |  
+F:SLAY_DEMON | STR | CON | SLAY_UNDEAD | BRAND_FIRE | SLAY_HUMAN |
 F:SUST_STR | FREE_ACT | RES_ACID | RES_DISEN | RES_FIRE | RES_COLD | 
 F:RES_CHAOS | SEE_INVIS | TELEPATHY | AGGRAVATE | DRAIN_EXP | SHOW_MODS |
 F:CHAOTIC | CURSED | HEAVY_CURSE | LITE
@@ -2757,7 +2757,7 @@ E:'Tonbo giri'
 I:22:7:3
 W:35:70:350:250000
 P:0:4d9:6:23:10
-F:STR | DEX | HIDE_TYPE | SEARCH | FREE_ACT |
+F:STR | DEX | HIDE_TYPE | SEARCH | FREE_ACT | SLAY_HUMAN |
 F:SLAY_TROLL | SLAY_GIANT | SLAY_ANIMAL | SLAY_ORC | RES_FIRE | RES_COLD |
 F:RES_ELEC | RES_ACID | RES_FEAR | SHOW_MODS | RIDING
 D:ÆÁÀî»ÍÅ·²¦¤Î£±¿ÍËÜ¿Ã龡¤Î°¦ÍѤÎÁä¤À¡£
@@ -2983,7 +2983,7 @@ F:KILL_DRAGON | SLAY_ANIMAL | SLAY_EVIL | BRAND_ELEC | BRAND_ACID |
 F:SLAY_UNDEAD | SLAY_DEMON | SLAY_TROLL | SLAY_GIANT | SLAY_ORC |
 F:IM_FIRE | RES_SHARDS | RES_FEAR | TUNNEL | INFRA | SEARCH | REFLECT |
 F:LITE | TELEPATHY | REGEN | BRAND_FIRE | BRAND_COLD | BRAND_POIS |
-F:HIDE_TYPE | SHOW_MODS | RIDING | QUESTITEM | INSTA_ART
+F:SLAY_HUMAN | HIDE_TYPE | SHOW_MODS | RIDING | QUESTITEM | INSTA_ART
 D:¤Ê¤ó¤È¤¤¤¦¤«Å¬Åö¤Ëºî¤é¤ì¤¿ËÀ¤À¡£
 
 N:182:¤¤¤¤¤«¤²¤ó¤Ê
@@ -3119,6 +3119,7 @@ W:45:1:180:100000
 P:0:6d6:16:16:0
 F:VAMPIRIC | STR | CON | FREE_ACT | HOLD_LIFE | RES_NETHER | RES_CONF |
 F:RES_CHAOS | CURSED | HEAVY_CURSE | DRAIN_EXP | AGGRAVATE | QUESTITEM
+F:SLAY_HUMAN |
 D:°ìËüǯ¤ÎŤ­¤Ë¤ï¤¿¤ê¡¢±É²Ú¤ò¸Ø¤ê¤·¥á¥ë¥Ë¥Ü¥Í¤Î¸÷¤ÎÄë¹ñ¤ÎËö´ü¡¢Â礤¤Ê¤ë
 D:°ÛÊÑÅ·ÃϤˤ¢¤ê¤Æ¡¢¿Í¤È¿À¡¹¤Î±¿Ì¿¤Ï¡Ò½ÉÌ¿¡Ó¤Î¤«¤Ê¤Æ¤³¤Î¾å¤ËÃäؤé¤ì¡¢
 D:¶²¤í¤·¤­À蘆¤¢¤ê¡¢¤â¤í¤â¤í¤Î·®¤·¹Ô¤Ê¤Ï¤ì¤¿¤ê¡£¤³¤Î¤È¤­¤¢¤Þ¤¿¤Îͦ¼Ô
@@ -3155,7 +3156,7 @@ E:of Guan Yu
 I:23:22:3
 W:60:60:320:200000
 P:0:4d5:20:20:5
-F:STR | DEX | CON | SLAY_EVIL |
+F:STR | DEX | CON | SLAY_EVIL | SLAY_HUMAN |
 F:VORPAL | SHOW_MODS
 D:Ë­¤«¤Êñù¤òÃߤ¨¤¿µÁ¿Í¡¦´Ø±©¤Ï¤³¤ÎÀÄζÅá¤Ç¿¤¯¤Î¹ë·æ¤òÃϤË
 D:᤭Éú¤»¤ÆÍ褿¡£
@@ -3369,7 +3370,7 @@ E:of Gothmog
 I:21:2:-2
 W:60:35:90:66666
 P:0:3d6:13:15:0
-F:INT | WIS | DEX | STEALTH | HIDE_TYPE | 
+F:INT | WIS | DEX | STEALTH | HIDE_TYPE | SLAY_HUMAN |
 F:HEAVY_CURSE | CURSED | AGGRAVATE | 
 F:BRAND_FIRE | IM_FIRE | RES_ELEC | RES_DARK | LITE
 F:SLAY_ANIMAL | SLAY_ORC | SLAY_TROLL | SLAY_GIANT | 
diff --git a/lib/edit/e_info_j.txt b/lib/edit/e_info_j.txt
index 832012f6f..f571fac68 100644
--- a/lib/edit/e_info_j.txt
+++ b/lib/edit/e_info_j.txt
@@ -780,7 +780,11 @@ C:0:0:0:5
 F:TUNNEL | BRAND_ACID | 
 F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
 
-# 101 (unused)
+N:101:¿Í»Â¤ê¤Î
+E:of Slay Human
+X:24:10
+W:0:23:0:2500
+F:SLAY_HUMAN
 
 N:102:¥â¥ë¥°¥ë¤Î
 E:of Morgul
diff --git a/lib/edit/r_info_j.txt b/lib/edit/r_info_j.txt
index c3db6a254..55d441a6f 100644
--- a/lib/edit/r_info_j.txt
+++ b/lib/edit/r_info_j.txt
@@ -210,7 +210,7 @@ W:0:2:0:0:10:14
 B:BEG
 B:TOUCH:EAT_GOLD
 F:MALE | EVIL | WILD_TOWN | WILD_ONLY
-F:RAND_25 | FRIENDS | 
+F:RAND_25 | FRIENDS | HUMAN |
 F:TAKE_ITEM | OPEN_DOOR | DROP_CORPSE | DROP_SKELETON
 D:$He looks squalid and thoroughly revolting.
 D:Èà¤Ï±ø¤é¤·¤¯¤ÆËÜÅö¤ËƬ¤ËÍè¤ëÅÛ¤À¡£
@@ -277,9 +277,9 @@ I:110:3d3:10:1:255
 W:0:1:0:0:100:83
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
-F:MALE | WILD_ONLY | WILD_WOOD |
+F:MALE | WILD_ONLY | WILD_WOOD | HUMAN |
 F:RAND_25 | DROP_SKELETON | DROP_CORPSE |
-F:ONLY_GOLD | DROP_60 | 
+F:ONLY_GOLD | DROP_60 |
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR
 D:$He has an axe with a sharp and strong edge.
 D:±Ô¤¯´è¾æ¤ÊÉà¤ò»ý¤Ã¤Æ¤¤¤ë¡£
@@ -332,7 +332,7 @@ I:110:1d2:6:1:0
 W:0:1:0:0:0:0
 B:DROOL
 F:MALE | DROP_CORPSE | DROP_SKELETON | WILD_TOWN | WILD_ONLY
-F:RAND_25 | EAT_LOSE_INT |
+F:RAND_25 | EAT_LOSE_INT | HUMAN |
 F:TAKE_ITEM
 D:$He tends to blubber a lot.
 D:Èà¤Ï¤¤¤Ä¤âµã¤¤¤Æ¤Ð¤«¤ê¤¤¤ë¡£
@@ -346,7 +346,7 @@ I:110:1d2:6:1:0
 W:0:1:0:0:0:0
 B:DROOL
 F:MALE | DROP_SKELETON | DROP_CORPSE | WILD_TOWN | WILD_ONLY
-F:RAND_25 | EAT_LOSE_CHR |
+F:RAND_25 | EAT_LOSE_CHR | HUMAN |
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR
 D:$Ugly doesn't begin to describe him.
 D:½¹¤¤ÃˤÀ¤¬¡¢°ìÈÖ¤ÎÆÃħ¤Ï¤½¤Î½¹¤µ¤Ç¤Ï¤Ê¤¤¡£
@@ -359,7 +359,7 @@ I:120:4d4:6:1:0
 W:0:1:0:0:0:0
 B:DROOL
 F:MALE | DROP_CORPSE | DROP_SKELETON | WILD_TOWN | WILD_ONLY
-F:RAND_25 | EAT_LOSE_WIS |
+F:RAND_25 | EAT_LOSE_WIS | HUMAN |
 F:TAKE_ITEM
 D:$Drooling and comical, but then, what do you expect?
 D:¤è¤À¤ì¤ò¿â¤é¤·¤Æ³Ú¤·¤½¤¦¤Ë¤·¤Æ¤¤¤ë¤¬¡¢¤½¤ì°Ê¾å¤Î²¿¤ò´üÂÔ¤¹¤ë¤Î¤À¤í¤¦¤«¡©
@@ -371,7 +371,7 @@ G:t:U
 I:110:1d4:10:1:40
 W:0:1:0:0:10:14
 B:BEG
-F:MALE | DROP_SKELETON | DROP_CORPSE
+F:MALE | DROP_SKELETON | DROP_CORPSE | HUMAN |
 F:RAND_25 | WILD_TOWN | WILD_ONLY
 F:TAKE_ITEM | OPEN_DOOR
 D:$You just can't help feeling sorry for him.
@@ -392,7 +392,7 @@ I:110:1d1:10:1:50
 W:0:1:0:0:0:0
 B:BEG
 B:TOUCH:DISEASE
-F:MALE | DROP_CORPSE | DROP_SKELETON
+F:MALE | DROP_CORPSE | DROP_SKELETON | HUMAN |
 F:RAND_25 | WILD_TOWN | WILD_ONLY
 F:TAKE_ITEM | OPEN_DOOR | EAT_LOSE_CON | EAT_POISONOUS
 D:$You feel it isn't safe to touch him.
@@ -407,7 +407,7 @@ W:0:1:0:0:10:44
 B:HIT:HURT:1d6
 B:TOUCH:EAT_ITEM
 F:MALE | DROP_CORPSE | DROP_SKELETON
-F:DROP_60 | WILD_TOWN |
+F:DROP_60 | WILD_TOWN | HUMAN |
 F:WILD_SWAMP | WILD_WOOD | WILD_GRASS | WILD_MOUNTAIN | WILD_ONLY
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR |
 F:EVIL
@@ -422,7 +422,7 @@ I:110:2d3:10:1:0
 W:0:1:0:0:0:0
 B:BEG
 F:MALE | HAS_LITE_1
-F:RAND_50 | DROP_SKELETON | DROP_CORPSE
+F:RAND_50 | DROP_SKELETON | DROP_CORPSE | HUMAN |
 F:ONLY_GOLD | DROP_60 | WILD_TOWN | WILD_ONLY
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR
 D:$He makes you glad to be sober.
@@ -436,7 +436,7 @@ I:110:3d3:10:1:255
 W:0:1:0:0:0:0
 B:HIT:HURT:1d5
 F:MALE | HAS_LITE_1 |
-F:RAND_50 | 
+F:RAND_50 | HUMAN |
 F:ONLY_GOLD | DROP_60 | DROP_SKELETON | DROP_CORPSE
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | WILD_TOWN | WILD_ONLY
 D:$The typical ponce around town, with purse jingling, and looking for more 
@@ -451,7 +451,7 @@ G:t:R
 I:110:5d8:10:20:250
 W:0:1:0:0:8:43
 B:HIT:HURT:1d10
-F:MALE | DROP_SKELETON | DROP_CORPSE | HAS_LITE_1 |
+F:MALE | DROP_SKELETON | DROP_CORPSE | HAS_LITE_1 | HUMAN |
 F:RAND_50 | DROP_90 | WILD_GRASS | WILD_TOWN | WILD_WOOD | WILD_ONLY
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
 F:EVIL
@@ -468,7 +468,7 @@ G:t:r
 I:110:7d8:10:30:250
 W:0:1:0:0:8:43
 B:HIT:HURT:2d6
-F:MALE | DROP_SKELETON | DROP_CORPSE | HAS_LITE_1 |
+F:MALE | DROP_SKELETON | DROP_CORPSE | HAS_LITE_1 | HUMAN |
 F:RAND_50 | DROP_90 | WILD_TOWN | WILD_ONLY
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR
 D:$He doesn't take to strangers kindly.
@@ -482,7 +482,7 @@ W:0:4:0:0:0:0
 B:HIT:HURT:1d3
 F:UNIQUE | MALE | ANIMAL | CAN_SPEAK | FRIENDLY
 F:FORCE_MAXHP | DROP_CORPSE | WILD_TOWN | WILD_ONLY
-F:ONLY_ITEM | DROP_90 | DROP_GOOD |
+F:ONLY_ITEM | DROP_90 | DROP_GOOD | HUMAN |
 F:OPEN_DOOR | BASH_DOOR | HAS_LITE_1 |
 F:NO_CONF | NO_SLEEP
 
@@ -822,7 +822,7 @@ B:HIT:HURT:1d8
 B:HIT:HURT:1d8
 B:HIT:HURT:1d7
 F:MALE | HAS_LITE_1 |
-F:DROP_60 | WILD_ALL | DROP_SKELETON | DROP_CORPSE
+F:DROP_60 | WILD_ALL | DROP_SKELETON | DROP_CORPSE | HUMAN |
 F:OPEN_DOOR | BASH_DOOR | EAT_GIVE_STR | EAT_LOSE_INT | EAT_LOSE_WIS
 D:$He looks inexperienced but tough.
 D:Èà¤Ï¤Þ¤À¤Þ¤À·Ð¸³¤ÏÀõ¤¤¤è¤¦¤À¤¬¡¢¼ê¶¯¤¤Áê¼ê¤À¡£
@@ -836,7 +836,7 @@ W:2:1:0:8:50:150
 B:HIT:HURT:1d5
 B:HIT:HURT:1d5
 B:TOUCH:EAT_GOLD
-F:MALE |
+F:MALE | HUMAN |
 F:DROP_60 | DROP_SKELETON | DROP_CORPSE
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | WILD_ALL |
 F:EVIL | EAT_GIVE_DEX | EAT_LOSE_WIS | EAT_LOSE_CHR
@@ -850,7 +850,7 @@ G:p:B
 I:110:7d4:20:10:10
 W:2:1:0:9:100:225
 B:HIT:HURT:1d9
-F:MALE | HAS_LITE_1 |
+F:MALE | HAS_LITE_1 | HUMAN |
 F:FORCE_SLEEP | GOOD | WILD_ALL | DROP_SKELETON | DROP_CORPSE
 F:DROP_60 | EAT_GIVE_WIS | EAT_LOSE_INT | EAT_LOSE_CON
 F:OPEN_DOOR | BASH_DOOR
@@ -866,7 +866,7 @@ G:p:R
 I:110:6d4:20:6:5
 W:2:1:0:9:100:240
 B:HIT:HURT:1d8
-F:MALE | HAS_LITE_1 |
+F:MALE | HAS_LITE_1 | HUMAN |
 F:FORCE_SLEEP | WILD_ALL | DROP_SKELETON | DROP_CORPSE
 F:DROP_60 | EAT_GIVE_INT | EAT_LOSE_STR | EAT_LOSE_CON
 F:OPEN_DOOR | BASH_DOOR
@@ -1415,7 +1415,7 @@ W:4:1:0:18:500:1039
 B:SHOOT:HURT:2d7
 B:HIT:HURT:1d7
 B:HIT:HURT:1d7
-F:MALE | HAS_LITE_1 |
+F:MALE | HAS_LITE_1 | HUMAN |
 F:FORCE_SLEEP | DROP_SKELETON | DROP_CORPSE
 F:DROP_60 | EAT_LOSE_STR | EAT_LOSE_WIS | EAT_GIVE_CON |
 F:OPEN_DOOR | BASH_DOOR | WILD_WOOD |
@@ -1561,7 +1561,7 @@ G:p:R
 I:110:6d4:20:6:10
 W:5:2:0:7:100:240
 B:HIT:HURT:1d8
-F:MALE | HAS_LITE_2 |
+F:MALE | HAS_LITE_2 | HUMAN |
 F:FORCE_SLEEP | 
 F:FRIENDS | DROP_60 | WILD_ALL | DROP_SKELETON | DROP_CORPSE
 F:OPEN_DOOR | BASH_DOOR |
@@ -1620,7 +1620,7 @@ I:110:6d8:20:16:5
 W:4:1:0:20:500:1038
 B:HIT:HURT:2d4
 B:HIT:HURT:2d4
-F:MALE | HAS_LITE_1 |
+F:MALE | HAS_LITE_1 | HUMAN |
 F:FORCE_SLEEP | 
 F:DROP_60 | WILD_ALL | DROP_SKELETON | DROP_CORPSE |
 F:OPEN_DOOR | BASH_DOOR | EAT_GIVE_WIS | EAT_LOSE_INT
@@ -1792,7 +1792,7 @@ G:p:B
 I:110:7d4:20:10:5
 W:6:2:0:7:100:225
 B:HIT:HURT:1d9
-F:MALE | GOOD | HAS_LITE_2 |
+F:MALE | GOOD | HAS_LITE_2 | HUMAN |
 F:FORCE_SLEEP | WILD_ALL | DROP_SKELETON | DROP_CORPSE |
 F:FRIENDS | DROP_60 |
 F:OPEN_DOOR | BASH_DOOR
@@ -1810,7 +1810,7 @@ W:6:2:0:6:70:216
 B:HIT:HURT:1d8
 B:HIT:HURT:1d8
 B:HIT:HURT:1d7
-F:MALE | HAS_LITE_2 |
+F:MALE | HAS_LITE_2 | HUMAN |
 F:FRIENDS | DROP_60 | WILD_ALL |
 F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE
 D:$He looks inexperienced but tough.
@@ -1902,7 +1902,7 @@ W:6:2:0:20:140:219
 B:SHOOT:HURT:2d5
 B:HIT:HURT:1d5
 B:HIT:HURT:1d5
-F:MALE | HAS_LITE_1 |
+F:MALE | HAS_LITE_1 | HUMAN |
 F:FORCE_SLEEP | WILD_ALL | DROP_SKELETON | DROP_CORPSE
 F:ONLY_GOLD | DROP_1D2 | EAT_GIVE_DEX | EAT_LOSE_INT | EAT_LOSE_WIS
 F:OPEN_DOOR | BASH_DOOR
@@ -2228,7 +2228,7 @@ B:HIT:HURT:1d6
 B:HIT:HURT:1d6
 B:TOUCH:EAT_GOLD
 F:UNIQUE | MALE | CAN_SPEAK | HAS_LITE_2 |
-F:FORCE_SLEEP | FORCE_MAXHP | 
+F:FORCE_SLEEP | FORCE_MAXHP | HUMAN |
 F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | DROP_GREAT | 
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON
 F:EVIL | RES_TELE
@@ -2257,7 +2257,7 @@ B:SHOOT:HURT:3d6
 B:HIT:HURT:2d6
 B:TOUCH:EAT_GOLD
 B:TOUCH:EAT_ITEM
-F:UNIQUE | MALE | FORCE_SLEEP | FORCE_MAXHP | CAN_SPEAK |
+F:UNIQUE | MALE | FORCE_SLEEP | FORCE_MAXHP | CAN_SPEAK | HUMAN |
 F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | DROP_GREAT | WILD_WOOD |
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | EVIL | DROP_SKELETON | DROP_CORPSE
 F:EAT_GIVE_DEX | EAT_LOSE_WIS
@@ -2335,7 +2335,7 @@ W:8:1:0:18:500:1039
 B:SHOOT:HURT:2d7
 B:HIT:HURT:1d7
 B:HIT:HURT:1d7
-F:MALE | HAS_LITE_2 |
+F:MALE | HAS_LITE_2 | HUMAN |
 F:FORCE_SLEEP | FRIENDS | DROP_60 | DROP_SKELETON | DROP_CORPSE
 F:OPEN_DOOR | BASH_DOOR |
 S:1_IN_9 | 
@@ -2407,7 +2407,7 @@ W:8:2:0:20:500:1038
 B:HIT:HURT:2d4
 B:HIT:HURT:2d4
 F:MALE | GOOD | WILD_ALL | DROP_SKELETON | DROP_CORPSE
-F:FORCE_SLEEP | HAS_LITE_2 |
+F:FORCE_SLEEP | HAS_LITE_2 | HUMAN |
 F:FRIENDS | DROP_60 | 
 F:OPEN_DOOR | BASH_DOOR
 S:1_IN_9 | 
@@ -2450,7 +2450,7 @@ I:110:8d8:20:24:10
 W:8:2:0:26:100:199
 B:HIT:HURT:2d6
 B:TOUCH:EAT_GOLD
-F:MALE |
+F:MALE | HUMAN |
 F:DROP_1D2 | WILD_ALL |
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE
 F:EVIL
@@ -2754,7 +2754,7 @@ B:HIT:HURT:1d13
 B:HIT:HURT:1d13
 B:HIT:HURT:1d13
 B:HIT:HURT:1d13
-F:UNIQUE | MALE | EVIL | HAS_LITE_2 |
+F:UNIQUE | MALE | EVIL | HAS_LITE_2 | HUMAN |
 F:FORCE_MAXHP | CAN_SPEAK | WILD_ALL | DROP_SKELETON | DROP_CORPSE
 F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | EAT_POISONOUS |
 F:OPEN_DOOR | BASH_DOOR
@@ -3264,7 +3264,7 @@ I:110:9d8:20:32:10
 W:10:3:0:35:500:376
 B:TOUCH:EAT_GOLD
 B:TOUCH:EAT_ITEM
-F:MALE |
+F:MALE | HUMAN |
 F:DROP_1D2 | 
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
 F:EVIL | DROP_SKELETON
@@ -3430,7 +3430,7 @@ W:11:1:0:30:0:0
 B:BITE:HURT:2d5
 B:BITE:HURT:2d5
 F:AQUATIC | WILD_ALL | DROP_CORPSE
-F:ANIMAL
+F:ANIMAL | RIDING
 D:$A truly strange hybrid of a horse and a fish.
 D:ËÜÅö¤Ë´ñ̯¤ÊÇϤȵû¤Î³Ý¤±¹ç¤ï¤»¤À¡£
 
@@ -3622,7 +3622,7 @@ W:12:1:0:40:0:0
 B:SHOOT:HURT:4d6
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
-F:MALE | HAS_LITE_2 |
+F:MALE | HAS_LITE_2 | HUMAN |
 F:DROP_1D2 | 
 F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE
 S:1_IN_8
@@ -3725,7 +3725,7 @@ W:12:1:0:36:800:445
 B:HIT:HURT:2d3
 B:HIT:HURT:2d3
 F:MALE | GOOD | HAS_LITE_2 |
-F:FORCE_SLEEP | 
+F:FORCE_SLEEP | HUMAN |
 F:DROP_1D2 | 
 F:SMART | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE
 S:1_IN_3 |
@@ -3971,7 +3971,7 @@ G:p:v
 I:110:12d8:20:10:10
 W:13:2:0:50:500:449
 B:HIT:HURT:2d2
-F:MALE |
+F:MALE | HUMAN |
 F:FORCE_SLEEP | DROP_1D2 | DROP_SKELETON | DROP_CORPSE
 F:SMART | OPEN_DOOR | BASH_DOOR | EAT_CONF
 F:EVIL
@@ -3993,7 +3993,7 @@ I:110:12d12:20:10:10
 W:13:2:0:50:700:370
 B:HIT:HURT:2d4
 B:HIT:HURT:2d4
-F:MALE | WILD_WOOD | HAS_LITE_2 |
+F:MALE | WILD_WOOD | HAS_LITE_2 | HUMAN |
 F:FORCE_SLEEP | DROP_1D2 | DROP_SKELETON | DROP_CORPSE
 F:SMART | OPEN_DOOR | BASH_DOOR | EAT_SLEEP |
 S:1_IN_3 | 
@@ -4827,7 +4827,7 @@ B:HIT:HURT:3d5
 B:HIT:HURT:3d5
 B:HIT:HURT:3d5
 F:UNIQUE | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE
-F:MALE | 
+F:MALE | HUMAN |
 F:FORCE_MAXHP | 
 F:ONLY_ITEM | DROP_90 | DROP_GOOD | 
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
@@ -4857,6 +4857,7 @@ W:16:3:0:50:0:0
 B:HIT:SUPERHURT:4d4
 B:HIT:SUPERHURT:4d4
 B:HIT:SUPERHURT:4d4
+F:HUMAN |
 F:MALE | NO_FEAR | NO_STUN | BASH_DOOR | OPEN_DOOR | DROP_1D2 | HAS_LITE_1 |
 F:WILD_WASTE | DROP_SKELETON | DROP_CORPSE | EAT_BERSERKER
 D:$A warrior in a battle-frenzy; he'll stop only when he drops.
@@ -6187,7 +6188,7 @@ B:HIT:SUPERHURT:5d1
 B:KICK:SUPERHURT:5d5
 B:HIT:SUPERHURT:5d1
 F:MALE | DROP_60 | DROP_1D2 | OPEN_DOOR | BASH_DOOR | IM_ELEC | HAS_LITE_2 |
-F:IM_FIRE | IM_COLD | IM_POIS | NO_FEAR | NO_CONF | NO_SLEEP | 
+F:IM_FIRE | IM_COLD | IM_POIS | NO_FEAR | NO_CONF | NO_SLEEP | HUMAN |
 F:DROP_CORPSE | DROP_SKELETON
 S:1_IN_6 | 
 S:BO_ELEC
@@ -6218,7 +6219,7 @@ I:110:15d11:20:40:40
 W:23:1:0:60:2500:532
 B:HIT:HURT:3d5
 B:HIT:SUPERHURT:3d5
-F:MALE | HAS_LITE_2 |
+F:MALE | HAS_LITE_2 | HUMAN |
 F:DROP_1D2 | 
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE
 F:EVIL
@@ -6294,7 +6295,7 @@ W:23:2:0:110:2500:516
 B:HIT:HURT:2d8
 B:HIT:HURT:2d8
 B:HIT:EAT_GOLD:4d4
-F:MALE | DROP_SKELETON | DROP_CORPSE
+F:MALE | DROP_SKELETON | DROP_CORPSE | HUMAN |
 F:DROP_2D2 | EAT_GIVE_DEX | EAT_LOSE_WIS |
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
 F:EVIL
@@ -6355,7 +6356,7 @@ B:HIT:HURT:4d6
 B:HIT:HURT:4d6
 B:HIT:HURT:4d6
 F:UNIQUE | MALE | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE
-F:FORCE_SLEEP | FORCE_MAXHP | 
+F:FORCE_SLEEP | FORCE_MAXHP | HUMAN |
 F:ONLY_ITEM | DROP_90 | DROP_1D2 | DROP_GOOD | 
 F:OPEN_DOOR | BASH_DOOR | 
 F:EVIL | IM_FIRE | IM_ELEC | NO_CONF | NO_SLEEP
@@ -6570,7 +6571,7 @@ B:HIT:HURT:4d6
 B:HIT:HURT:4d6
 B:HIT:HURT:4d6
 F:UNIQUE | MALE | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE
-F:FORCE_SLEEP | FORCE_MAXHP | HAS_LITE_1 |
+F:FORCE_SLEEP | FORCE_MAXHP | HAS_LITE_1 | HUMAN |
 F:ONLY_ITEM | DROP_90 | DROP_1D2 | DROP_GOOD | 
 F:OPEN_DOOR | BASH_DOOR | 
 F:EVIL | IM_FIRE | IM_ELEC | NO_CONF | NO_SLEEP
@@ -6691,7 +6692,7 @@ I:110:80d12:12:80:10
 W:25:3:0:600:0:0
 B:HIT:HURT:1d12
 B:HIT:HURT:3d6
-F:FORCE_SLEEP | 
+F:FORCE_SLEEP | HUMAN |
 F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | 
 F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
 F:HURT_ROCK | NONLIVING |
@@ -6954,7 +6955,7 @@ B:HIT:HURT:4d6
 B:HIT:HURT:4d6
 B:HIT:HURT:4d6
 F:UNIQUE | MALE | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE
-F:FORCE_MAXHP | WILD_ALL | HAS_LITE_2 |
+F:FORCE_MAXHP | WILD_ALL | HAS_LITE_2 | HUMAN |
 F:ONLY_ITEM | DROP_90 | DROP_GOOD | 
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
 F:EVIL
@@ -6971,7 +6972,7 @@ W:26:3:0:100:0:0
 B:HIT:HURT:1d9
 B:HIT:HURT:1d9
 F:FRIENDS | MALE | DROP_SKELETON | DROP_CORPSE
-F:BASH_DOOR | OPEN_DOOR | HAS_LITE_2 |
+F:BASH_DOOR | OPEN_DOOR | HAS_LITE_2 | HUMAN |
 S:1_IN_8
 S:BLIND | CONF | TPORT
 D:$A faithful servitor and a skilled warrior.
@@ -7516,7 +7517,7 @@ W:28:1:0:240:1800:497
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
-F:MALE | 
+F:MALE | HUMAN |
 F:FORCE_SLEEP | DROP_1D2 | 
 F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE
 F:EVIL
@@ -7570,7 +7571,7 @@ I:120:25d10:100:50:10
 W:28:3:0:250:6000:637
 B:HIT:CONFUSE:5d5
 B:HIT:TERRIFY:5d5
-F:MALE | HAS_LITE_2 |
+F:MALE | HAS_LITE_2 | HUMAN |
 F:FORCE_SLEEP | DROP_1D2 | DROP_SKELETON | DROP_CORPSE
 F:OPEN_DOOR | BASH_DOOR | SMART | EAT_GIVE_WIS |
 F:EVIL
@@ -7636,7 +7637,7 @@ W:28:1:0:150:2500:571
 B:HIT:HURT:2d5
 B:HIT:HURT:2d5
 B:TOUCH:DR_MANA:2d6
-F:MALE | HAS_LITE_2 |
+F:MALE | HAS_LITE_2 | HUMAN |
 F:FORCE_SLEEP | 
 F:ONLY_ITEM | DROP_1D2 | DROP_SKELETON | DROP_CORPSE
 F:SMART | OPEN_DOOR | BASH_DOOR | EAT_GIVE_INT | EAT_LOSE_STR |
@@ -8362,7 +8363,7 @@ W:32:2:0:300:0:0
 B:HIT:POISON:3d4
 B:HIT:LOSE_STR:3d4
 B:HIT:LOSE_STR:3d4
-F:MALE | 
+F:MALE | HUMAN |
 F:DROP_1D2 | 
 F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE |
 F:EVIL | NO_CONF | NO_SLEEP | EAT_GIVE_DEX | EAT_POISONOUS
@@ -8506,7 +8507,7 @@ B:KICK:SUPERHURT:8d1
 B:HIT:SUPERHURT:8d1
 B:KICK:SUPERHURT:8d4
 B:HIT:SUPERHURT:8d1
-F:MALE | DROP_60 | DROP_1D2 | OPEN_DOOR | BASH_DOOR | IM_FIRE | 
+F:MALE | DROP_60 | DROP_1D2 | OPEN_DOOR | BASH_DOOR | IM_FIRE | HUMAN |
 F:IM_POIS | NO_FEAR | NO_CONF | NO_SLEEP | DROP_CORPSE | HAS_LITE_1 |
 F:DROP_SKELETON | HAS_LITE_2 |
 S:1_IN_7 | 
@@ -8618,7 +8619,7 @@ B:HIT:HURT:10d2
 B:KICK:HURT:10d2
 B:PUNCH:HURT:10d2
 B:KICK:HURT:10d2
-F:MALE | 
+F:MALE | HUMAN |
 F:FORCE_SLEEP | FORCE_MAXHP | EVIL | HAS_LITE_1 |
 F:ONLY_ITEM | DROP_1D2 | ATTR_ANY | DROP_SKELETON | DROP_CORPSE
 F:INVISIBLE | OPEN_DOOR | BASH_DOOR | HAS_LITE_1 |
@@ -8765,7 +8766,7 @@ B:SLASH:HURT:6d5
 B:SLASH:HURT:25d1
 B:SLASH:HURT:30d1
 #F:UNIQUE | MALE | WEIRD_MIND | CAN_SPEAK |
-F:UNIQUE | MALE | CAN_SPEAK |
+F:UNIQUE | MALE | CAN_SPEAK | HUMAN |
 F:FORCE_MAXHP | WILD_ALL | DROP_CORPSE
 F:ONLY_ITEM | DROP_1D2 | DROP_GOOD |
 F:OPEN_DOOR | BASH_DOOR | 
@@ -8990,7 +8991,7 @@ B:HIT:HURT:2d8
 B:HIT:HURT:3d4
 B:HIT:EAT_GOLD:4d4
 B:HIT:EAT_ITEM:4d5
-F:MALE | 
+F:MALE | HUMAN |
 F:DROP_90 | DROP_2D2 | DROP_SKELETON | DROP_CORPSE
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | EAT_GIVE_DEX | EAT_LOSE_WIS |
 F:EVIL
@@ -9007,7 +9008,7 @@ B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
-F:UNIQUE | MALE | CAN_SPEAK | HAS_LITE_1 |
+F:UNIQUE | MALE | CAN_SPEAK | HAS_LITE_1 | HUMAN |
 F:FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE
 F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
@@ -10090,7 +10091,7 @@ I:110:28d13:20:50:10
 W:36:2:0:666:6000:638
 B:HIT:HURT:2d6
 B:HIT:HURT:2d6
-F:MALE |
+F:MALE | HUMAN |
 F:FORCE_SLEEP | FORCE_MAXHP | 
 F:ONLY_ITEM | DROP_1D2 | DROP_SKELETON
 F:SMART | OPEN_DOOR | BASH_DOOR | 
@@ -10141,7 +10142,7 @@ B:HIT:HURT:6d6
 B:HIT:HURT:6d6
 B:HIT:HURT:3d8
 B:HIT:HURT:3d8
-F:UNIQUE | MALE | CAN_SPEAK |
+F:UNIQUE | MALE | CAN_SPEAK | HUMAN |
 F:FORCE_SLEEP | FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE
 F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
 F:OPEN_DOOR | BASH_DOOR | 
@@ -10647,7 +10648,7 @@ B:HIT:HURT:6d6
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:EXP_20
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | RES_NETH |
+F:FORCE_SLEEP | FORCE_MAXHP | SMART | RES_NETH | HUMAN |
 F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | 
 F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
 F:EVIL | IM_COLD | HAS_LITE_1 |
@@ -10670,7 +10671,7 @@ B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:UN_POWER:5d5
 B:HIT:UN_BONUS:5d5
-F:UNIQUE | MALE | CAN_SPEAK | HAS_LITE_2 |
+F:UNIQUE | MALE | CAN_SPEAK | HAS_LITE_2 | HUMAN |
 F:FORCE_SLEEP | FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE
 F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
 F:SMART | OPEN_DOOR | TAKE_ITEM | BASH_DOOR | 
@@ -11489,7 +11490,7 @@ B:HIT:HURT:2d6
 B:HIT:HURT:2d8
 F:FEMALE |
 F:FORCE_SLEEP | FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
+F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | HUMAN |
 F:OPEN_DOOR | BASH_DOOR | 
 F:EVIL | NO_CONF | NO_SLEEP
 S:1_IN_2 | 
@@ -11511,7 +11512,7 @@ B:HIT:HURT:3d4
 B:HIT:HURT:3d5
 F:MALE | HAS_LITE_2 |
 F:FORCE_SLEEP | FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE
-F:ONLY_ITEM | DROP_90 | DROP_2D2 | 
+F:ONLY_ITEM | DROP_90 | DROP_2D2 | HUMAN |
 F:SMART | OPEN_DOOR | BASH_DOOR | 
 F:EVIL | NO_CONF | NO_SLEEP
 S:1_IN_2 | 
@@ -11541,7 +11542,7 @@ B:HIT:HURT:2d8
 B:HIT:HURT:2d8
 F:MALE | HAS_LITE_2 |
 F:FORCE_SLEEP | FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE
-F:ONLY_ITEM | DROP_90 | DROP_4D2 | 
+F:ONLY_ITEM | DROP_90 | DROP_4D2 | HUMAN |
 F:OPEN_DOOR | BASH_DOOR | 
 F:EVIL | NO_CONF | NO_SLEEP
 S:1_IN_2 | 
@@ -12053,7 +12054,7 @@ B:HIT:HURT:8d6
 B:HIT:UN_BONUS:6d8
 B:HIT:UN_BONUS:6d8
 F:UNIQUE | MALE | CAN_SPEAK | AMBERITE | DROP_SKELETON | DROP_CORPSE
-F:FORCE_SLEEP | FORCE_MAXHP | HAS_LITE_2 |
+F:FORCE_SLEEP | FORCE_MAXHP | HAS_LITE_2 | HUMAN |
 F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
 F:SMART | OPEN_DOOR | BASH_DOOR |
 F:IM_ACID | IM_COLD | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP | RES_TELE
@@ -12312,7 +12313,7 @@ B:HIT:EAT_ITEM:2d10
 B:HIT:EAT_ITEM:2d10
 F:MALE | FORCE_MAXHP | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE
 F:REGENERATE | NO_CONF | NO_SLEEP | NO_STUN | NO_FEAR |
-F:RES_TELE |
+F:RES_TELE | HUMAN |
 F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | DROP_GREAT | UNIQUE |
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | SMART | POWERFUL |
 S:1_IN_3
@@ -12819,7 +12820,7 @@ W:44:2:0:5000:0:0
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
 B:HIT:HURT:3d5
-F:MALE | HAS_LITE_2 |
+F:MALE | HAS_LITE_2 | HUMAN |
 F:FORCE_SLEEP | FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE
 F:ONLY_ITEM | DROP_90 | DROP_4D2 | 
 F:SMART | OPEN_DOOR | BASH_DOOR | 
@@ -12920,7 +12921,7 @@ W:45:2:0:500:0:0
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 F:IM_POIS | IM_FIRE | IM_ELEC | IM_ACID | IM_COLD |
-F:NO_SLEEP | NO_FEAR |
+F:NO_SLEEP | NO_FEAR | HUMAN |
 F:FRIENDS |
 F:MALE | OPEN_DOOR | BASH_DOOR
 D:$Fierce, barbaric warriors, armed with great spiked clubs, and surrounded 
@@ -13834,7 +13835,7 @@ B:HIT:HURT:10d5
 B:HIT:HURT:10d5
 B:HIT:HURT:10d5
 B:HIT:EXP_80
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | IM_FIRE | IM_COLD | IM_POIS |
+F:FORCE_SLEEP | FORCE_MAXHP | SMART | IM_FIRE | IM_COLD | IM_POIS | HUMAN |
 F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | RES_NETH | RES_NEXU | RES_PLAS |
 F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | EVIL
 S:1_IN_5 |
@@ -13855,7 +13856,7 @@ B:CHARGE:EAT_ITEM:5d5
 B:SPIT:BLIND:10d5
 B:DROOL:DISEASE:8d5
 F:UNIQUE | MALE | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE
-F:FORCE_SLEEP | FORCE_MAXHP |
+F:FORCE_SLEEP | FORCE_MAXHP | HUMAN |
 F:ONLY_ITEM | DROP_1D2 | DROP_4D2 | DROP_GOOD |
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
 F:IM_POIS | IM_FIRE | NO_CONF | NO_SLEEP | EVIL | RES_TELE
@@ -14006,7 +14007,7 @@ B:KICK:HURT:20d2
 B:KICK:HURT:10d2
 B:HIT:POISON:20d1
 B:HIT:LOSE_ALL:15d1
-F:MALE | EVIL |
+F:MALE | EVIL | HUMAN |
 F:FORCE_SLEEP | FORCE_MAXHP | DROP_SKELETON |
 F:ONLY_ITEM | DROP_4D2 | ATTR_MULTI | SHAPECHANGER | ATTR_ANY |
 F:INVISIBLE | OPEN_DOOR | BASH_DOOR | SMART | HAS_LITE_2 |
@@ -14683,7 +14684,7 @@ B:HIT:CONFUSE:4d8
 B:HIT:TERRIFY:5d6
 B:HIT:PARALYZE:5d6
 B:HIT:BLIND:4d8
-F:UNIQUE | MALE | AMBERITE | DROP_CORPSE | HAS_LITE_2 |
+F:UNIQUE | MALE | AMBERITE | DROP_CORPSE | HAS_LITE_2 | HUMAN |
 F:FORCE_SLEEP | FORCE_MAXHP | SHAPECHANGER | CAN_SPEAK |
 F:ONLY_ITEM | DROP_1D2 | DROP_4D2 | DROP_GOOD | CAN_FLY |
 F:OPEN_DOOR | BASH_DOOR | ATTR_MULTI | RES_DISE | ATTR_ANY | RES_TELE
@@ -14909,7 +14910,7 @@ W:59:2:0:20000:0:0
 B:HIT:EXP_VAMP:6d6
 B:HIT:EXP_VAMP:8d8
 B:HIT:EXP_VAMP:10d10
-F:UNIQUE | MALE | CAN_SPEAK | HAS_LITE_2 |
+F:UNIQUE | MALE | CAN_SPEAK | HAS_LITE_2 | HUMAN |
 F:FORCE_SLEEP | FORCE_MAXHP | SMART | DROP_CORPSE |
 F:ONLY_ITEM | DROP_1D2 | DROP_4D2 | DROP_GOOD |
 F:OPEN_DOOR | BASH_DOOR | RES_NEXU | RES_NETH | EVIL | 
@@ -14933,7 +14934,7 @@ B:HIT:UN_BONUS:6d8
 B:HIT:UN_BONUS:6d8
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
-F:UNIQUE | MALE | ATTR_MULTI | CAN_SPEAK | FRIENDLY | HAS_LITE_2 |
+F:UNIQUE | MALE | ATTR_MULTI | CAN_SPEAK | FRIENDLY | HAS_LITE_2 | HUMAN |
 F:FORCE_SLEEP | FORCE_MAXHP | REFLECTING | RES_TELE
 F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD |
 F:SMART | OPEN_DOOR | BASH_DOOR | 
@@ -14962,7 +14963,7 @@ B:HIT:UN_BONUS:6d8
 B:HIT:UN_BONUS:6d8
 B:HIT:TERRIFY:5d5
 B:HIT:TERRIFY:5d5
-F:UNIQUE | MALE | CAN_SPEAK | FRIENDLY | HAS_LITE_2 |
+F:UNIQUE | MALE | CAN_SPEAK | FRIENDLY | HAS_LITE_2 | HUMAN |
 F:FORCE_SLEEP | FORCE_MAXHP | REFLECTING | RES_TELE |
 F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD |
 F:SMART | OPEN_DOOR | BASH_DOOR | 
@@ -14997,7 +14998,7 @@ B:HIT:CONFUSE:5d5
 B:HIT:UN_POWER:5d5
 F:UNIQUE | MALE | ATTR_MULTI | CAN_SPEAK | AMBERITE | ATTR_ANY | RES_TELE
 F:FORCE_SLEEP | FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE | HAS_LITE_2 |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD |
+F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | HUMAN |
 F:SMART | OPEN_DOOR | BASH_DOOR | 
 F:EVIL | IM_FIRE | IM_COLD |
 F:IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP
@@ -15432,7 +15433,7 @@ B:HIT:HURT:8d15
 B:HIT:HURT:8d15
 B:TOUCH:EAT_ITEM
 F:UNIQUE | MALE | CAN_SPEAK | AMBERITE | RES_TELE | DROP_CORPSE | HAS_LITE_2 |
-F:FORCE_SLEEP | FORCE_MAXHP | NO_CONF | NO_SLEEP | DROP_SKELETON |
+F:FORCE_SLEEP | FORCE_MAXHP | NO_CONF | NO_SLEEP | DROP_SKELETON | HUMAN |
 F:DROP_4D2 | DROP_1D2 | DROP_GOOD | DROP_60 | DROP_90 | ONLY_ITEM |
 F:EVIL | IM_FIRE | IM_ELEC | SMART | REGENERATE | OPEN_DOOR | BASH_DOOR |
 S:1_IN_3 |
@@ -15490,7 +15491,7 @@ B:HIT:POISON:8d15
 B:TOUCH:LOSE_CHR
 B:TOUCH:LOSE_CON
 F:UNIQUE | FEMALE | CAN_SPEAK | AMBERITE | ONLY_ITEM | RES_TELE
-F:DROP_CORPSE | DROP_SKELETON | HAS_LITE_2 |
+F:DROP_CORPSE | DROP_SKELETON | HAS_LITE_2 | HUMAN |
 F:FORCE_SLEEP | FORCE_MAXHP | NO_CONF | NO_SLEEP |
 F:DROP_4D2 | DROP_1D2 | DROP_GOOD | DROP_60 | DROP_90 |
 F:EVIL | IM_POIS | IM_ELEC | SMART | REGENERATE | OPEN_DOOR | BASH_DOOR |
@@ -15565,7 +15566,7 @@ B:SHOOT:HURT:10d15
 B:HIT:HURT:9d15
 B:HIT:HURT:9d15
 B:HIT:LOSE_CON:1d30
-F:UNIQUE | MALE | CAN_SPEAK | AMBERITE | RES_TELE | DROP_SKELETON |
+F:UNIQUE | MALE | CAN_SPEAK | AMBERITE | RES_TELE | DROP_SKELETON | HUMAN |
 F:FORCE_SLEEP | FORCE_MAXHP | NO_CONF | NO_SLEEP | DROP_CORPSE
 F:DROP_4D2 | DROP_1D2 | DROP_GOOD | DROP_60 | DROP_90 | ONLY_ITEM |
 F:HAS_LITE_2 |
@@ -15721,7 +15722,7 @@ B:INSULT:EAT_ITEM:1d3
 B:INSULT:EAT_GOLD:1d3
 F:UNIQUE | MALE | CAN_SPEAK | AMBERITE | RES_TELE | HAS_LITE_2 |
 F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | DROP_SKELETON
-F:FORCE_SLEEP | FORCE_MAXHP | NO_CONF | NO_SLEEP |
+F:FORCE_SLEEP | FORCE_MAXHP | NO_CONF | NO_SLEEP | HUMAN |
 F:DROP_4D2 | DROP_1D2 | DROP_GOOD | DROP_60 | DROP_90 | ONLY_ITEM |
 F:EVIL | IM_POIS | IM_ACID | IM_COLD | SMART | REGENERATE
 S:1_IN_4 |
@@ -15920,7 +15921,7 @@ W:74:1:0:36500:0:0
 B:HIT:SHATTER:15d15
 B:HIT:SHATTER:15d15
 F:UNIQUE | MALE | CAN_SPEAK | AMBERITE | RES_TELE | HAS_LITE_2 |
-F:DROP_SKELETON | DROP_CORPSE
+F:DROP_SKELETON | DROP_CORPSE | HUMAN |
 F:FORCE_SLEEP | FORCE_MAXHP | NO_CONF | NO_SLEEP | KILL_WALL |
 F:DROP_4D2 | DROP_1D2 | DROP_GOOD | DROP_60 | DROP_90 | ONLY_ITEM |
 F:EVIL | IM_POIS | IM_ACID | IM_FIRE | REGENERATE
@@ -16112,7 +16113,7 @@ B:HIT:HURT:10d15
 B:HIT:EAT_ITEM:10d15
 F:UNIQUE | MALE | CAN_SPEAK | SMART | AMBERITE | RES_TELE | HAS_LITE_2 |
 F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | DROP_SKELETON
-F:FORCE_SLEEP | FORCE_MAXHP | NO_CONF | NO_SLEEP |
+F:FORCE_SLEEP | FORCE_MAXHP | NO_CONF | NO_SLEEP | HUMAN |
 F:DROP_4D2 | DROP_1D2 | DROP_GOOD | DROP_60 | DROP_90 | ONLY_ITEM |
 F:EVIL | IM_POIS | IM_ACID | IM_ELEC | REGENERATE |
 S:1_IN_4 |
@@ -16266,7 +16267,7 @@ B:HIT:UN_BONUS:6d8
 B:HIT:UN_BONUS:6d8
 B:TOUCH:UN_POWER
 B:TOUCH:UN_POWER
-F:UNIQUE | MALE | 
+F:UNIQUE | MALE | HUMAN |
 F:FORCE_SLEEP | FORCE_MAXHP | SMART | HAS_LITE_2 |
 F:ONLY_ITEM | DROP_1D2 | DROP_4D2 | DROP_GOOD | 
 F:INVISIBLE | OPEN_DOOR | BASH_DOOR | 
@@ -16293,7 +16294,7 @@ B:HIT:UN_BONUS:6d8
 B:HIT:UN_POWER:6d8
 B:TOUCH:BLIND
 B:TOUCH:CONFUSE
-F:UNIQUE | MALE | CAN_SPEAK | POWERFUL | RES_TELE | HAS_LITE_2 |
+F:UNIQUE | MALE | CAN_SPEAK | POWERFUL | RES_TELE | HAS_LITE_2 | HUMAN |
 F:FORCE_SLEEP | FORCE_MAXHP | SMART | DROP_CORPSE | DROP_SKELETON 
 F:ONLY_ITEM | DROP_1D2 | DROP_GREAT | DROP_GOOD |
 F:INVISIBLE | OPEN_DOOR | BASH_DOOR | 
@@ -16328,7 +16329,7 @@ B:HIT:HURT:10d15
 B:HIT:LOSE_CON:10d15
 F:UNIQUE | MALE | CAN_SPEAK | SMART | AMBERITE | RES_TELE | HAS_LITE_2 |
 F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | DROP_SKELETON
-F:FORCE_SLEEP | FORCE_MAXHP | NO_CONF | NO_SLEEP |
+F:FORCE_SLEEP | FORCE_MAXHP | NO_CONF | NO_SLEEP | HUMAN |
 F:DROP_4D2 | DROP_1D2 | DROP_GOOD | DROP_60 | DROP_90 | ONLY_ITEM |
 F:POWERFUL |
 F:EVIL |IM_COLD | IM_POIS | IM_ACID | IM_ELEC | REGENERATE
@@ -16452,7 +16453,7 @@ B:HIT:HURT:15d15
 B:HIT:HURT:15d15
 F:UNIQUE | MALE | CAN_SPEAK | SMART | AMBERITE | RES_TELE | HAS_LITE_2 |
 F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | DROP_SKELETON
-F:FORCE_SLEEP | FORCE_MAXHP | NO_CONF | NO_SLEEP |
+F:FORCE_SLEEP | FORCE_MAXHP | NO_CONF | NO_SLEEP | HUMAN |
 F:DROP_4D2 | DROP_1D2 | DROP_GOOD | DROP_60 | DROP_90 | ONLY_ITEM |
 F:EVIL | IM_COLD | IM_POIS | IM_ACID | IM_ELEC | IM_FIRE | REGENERATE
 S:1_IN_4 |
@@ -17476,7 +17477,7 @@ B:HIT:UN_BONUS:10d12
 B:TOUCH:UN_POWER
 B:TOUCH:UN_POWER
 F:UNIQUE | MALE | CAN_SPEAK | REFLECTING | HAS_LITE_2 |
-F:FORCE_SLEEP | FORCE_MAXHP |
+F:FORCE_SLEEP | FORCE_MAXHP | HUMAN |
 F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT |
 F:SMART | OPEN_DOOR | BASH_DOOR | MOVE_BODY | REGENERATE | 
 F:EVIL | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
@@ -17554,7 +17555,7 @@ B:HIT:BLIND:10d3
 B:TOUCH:DR_MANA:10d8
 F:UNIQUE | QUESTOR | MALE | CAN_SPEAK | DROP_CORPSE | HAS_LITE_2 |
 F:ATTR_MULTI | AMBERITE | RES_TELE
-F:FORCE_SLEEP | FORCE_MAXHP | FORCE_DEPTH | 
+F:FORCE_SLEEP | FORCE_MAXHP | FORCE_DEPTH | HUMAN |
 F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT |
 F:REFLECTING | AURA_FIRE | AURA_ELEC
 F:SMART | OPEN_DOOR | BASH_DOOR | MOVE_BODY | REGENERATE | 
@@ -17848,7 +17849,7 @@ B:HIT:EXP_10:7d2
 B:KICK:SUPERHURT:7d4
 B:HIT:EXP_10:7d2
 F:MALE | DROP_60 | DROP_1D2 | OPEN_DOOR | BASH_DOOR | IM_COLD | HAS_LITE_2 |
-F:IM_POIS | RES_NETH | NO_FEAR | NO_CONF | NO_SLEEP | 
+F:IM_POIS | RES_NETH | NO_FEAR | NO_CONF | NO_SLEEP | HUMAN |
 F:DROP_CORPSE | DROP_SKELETON
 S:1_IN_9 | 
 S:BO_NETH
@@ -17904,7 +17905,7 @@ B:KICK:HURT:7d10
 B:HIT:UN_POWER:7d8
 B:KICK:HURT:7d10
 B:HIT:UN_POWER:7d8
-F:UNIQUE | MALE | HAS_LITE_2 |
+F:UNIQUE | MALE | HAS_LITE_2 | HUMAN |
 F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | CAN_SPEAK |
 F:ONLY_ITEM | DROP_1D2 | DROP_3D2 | DROP_GOOD | DROP_GREAT |
 F:OPEN_DOOR | POWERFUL | MOVE_BODY | CAN_SWIM |
@@ -18004,7 +18005,7 @@ B:CLAW:EXP_VAMP:10d10
 B:CLAW:EXP_VAMP:10d10
 B:SPIT:BLIND:10d10
 B:HIT:LOSE_CON:10d10
-F:UNIQUE | MALE | 
+F:UNIQUE | MALE | HUMAN |
 F:FORCE_SLEEP | FORCE_MAXHP | SMART | CAN_SPEAK | CAN_FLY | AURA_COLD |
 F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | DROP_GREAT |
 F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | REGENERATE | 
@@ -18039,7 +18040,7 @@ B:HIT:TIME:5d8
 B:HIT:TIME:5d8
 B:KICK:UN_BONUS:8d10
 F:UNIQUE | MALE | CAN_SPEAK | DROP_CORPSE | FORCE_SLEEP | FORCE_MAXHP |
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_4D2 | DROP_GOOD |
+F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_4D2 | DROP_GOOD | HUMAN |
 F:REFLECTING | SMART | REGENERATE | PASS_WALL | CAN_FLY |
 F:EVIL | IM_ACID | IM_COLD | IM_POIS | IM_FIRE | IM_ELEC | NO_CONF | 
 F:NO_SLEEP | RES_NEXU | RES_WATE | ESCORT
@@ -18063,7 +18064,7 @@ B:HIT:HURT:14d14
 B:HIT:HURT:14d14
 B:HIT:HURT:14d14
 F:UNIQUE | MALE | DROP_CORPSE | FORCE_SLEEP | FORCE_MAXHP | FRIENDLY |
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_3D2 | DROP_GOOD |
+F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_3D2 | DROP_GOOD | HUMAN |
 F:REFLECTING | SMART | REGENERATE | OPEN_DOOR |
 F:GOOD | IM_COLD | IM_FIRE | IM_ELEC | NO_CONF | NO_STUN |
 F:NO_SLEEP | RES_TELE | RES_NETH | POWERFUL | CAN_FLY |
@@ -18085,7 +18086,7 @@ B:HIT:CONFUSE:8d8
 B:TOUCH:UN_POWER
 B:TOUCH:UN_POWER
 F:UNIQUE | FEMALE | DROP_CORPSE | FORCE_SLEEP | FORCE_MAXHP | CAN_SPEAK |
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_3D2 | DROP_GOOD |
+F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_3D2 | DROP_GOOD | HUMAN |
 F:REFLECTING | SMART | REGENERATE | OPEN_DOOR |
 F:EVIL | IM_COLD | IM_FIRE | IM_ELEC | NO_CONF | NO_STUN |
 F:NO_SLEEP | RES_TELE | RES_NETH | RES_NEXU | POWERFUL | CAN_FLY |
@@ -18257,7 +18258,7 @@ B:HIT:HURT:8d6
 B:HIT:UN_BONUS:6d8
 B:HIT:UN_BONUS:6d8
 F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
+F:FORCE_SLEEP | FORCE_MAXHP | HUMAN |
 F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
 F:SMART | OPEN_DOOR | BASH_DOOR | HAS_LITE_2 |
 F:IM_ACID | IM_COLD | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP |
@@ -18423,7 +18424,7 @@ I:110:40d10:12:60:10
 W:25:2:0:350:0:0
 B:SLASH:HURT:4d6
 B:SLASH:HURT:4d6
-F:MALE | ONLY_ITEM | DROP_90 | DROP_CORPSE | DROP_SKELETON | GOOD
+F:MALE | ONLY_ITEM | DROP_90 | DROP_CORPSE | DROP_SKELETON | GOOD | HUMAN |
 F:OPEN_DOOR | BASH_DOOR | NO_FEAR | HAS_LITE_1 |
 D:$A warrior clad in ornate but effective armour, holding katana so sharp it
 D:$can cut your throat and you won't notice till you nod.
@@ -18639,7 +18640,7 @@ B:KICK:HURT:10d2
 B:KICK:HURT:10d2
 B:KICK:HURT:10d2
 F:MALE | GOOD | DROP_CORPSE | DROP_SKELETON |
-F:FORCE_SLEEP | FORCE_MAXHP | 
+F:FORCE_SLEEP | FORCE_MAXHP | HUMAN |
 F:ONLY_ITEM | DROP_1D2 | 
 F:INVISIBLE | OPEN_DOOR | BASH_DOOR | 
 F:IM_ACID | IM_POIS | NO_CONF | NO_SLEEP
@@ -18663,7 +18664,7 @@ B:KICK:HURT:15d2
 B:HIT:POISON:20d1
 B:HIT:PARALYZE:15d1
 F:MALE | GOOD | DROP_CORPSE | DROP_SKELETON |
-F:FORCE_SLEEP | FORCE_MAXHP | 
+F:FORCE_SLEEP | FORCE_MAXHP | HUMAN |
 F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | 
 F:INVISIBLE | OPEN_DOOR | BASH_DOOR | 
 F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
@@ -18688,7 +18689,7 @@ B:KICK:HURT:20d2
 B:HIT:POISON:20d1
 B:HIT:PARALYZE:20d1
 F:MALE | GOOD | DROP_CORPSE | DROP_SKELETON |
-F:FORCE_SLEEP | FORCE_MAXHP | 
+F:FORCE_SLEEP | FORCE_MAXHP | HUMAN |
 F:ONLY_ITEM | DROP_4D2 | 
 F:INVISIBLE | OPEN_DOOR | BASH_DOOR | 
 F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP
@@ -18840,7 +18841,7 @@ B:HIT:HURT:3d7
 B:HIT:HURT:3d7
 B:HIT:HURT:3d7
 F:UNIQUE | MALE | DROP_SKELETON | DROP_CORPSE | HAS_LITE_2 |
-F:FORCE_SLEEP | FORCE_MAXHP | 
+F:FORCE_SLEEP | FORCE_MAXHP | HUMAN |
 F:DROP_2D2 | ONLY_ITEM | DROP_GOOD |
 F:OPEN_DOOR | GOOD | CAN_SWIM | CAN_FLY |
 F:NO_CONF | NO_SLEEP | FRIENDLY | TAKE_ITEM |
@@ -18883,7 +18884,7 @@ F:EMPTY_MIND | WEIRD_MIND | REGENERATE | SHAPECHANGER | ATTR_ANY | POWERFUL |
 F:AURA_FIRE | AURA_ELEC | OPEN_DOOR | BASH_DOOR | PASS_WALL | KILL_WALL |
 F:TAKE_ITEM | KILL_ITEM | ORC | TROLL | GIANT | DRAGON | DEMON | UNDEAD |
 F:EVIL | ANIMAL | GOOD | AURA_COLD | NONLIVING | HURT_LITE | HURT_ROCK |
-F:IM_ACID | IM_ELEC | IM_FIRE | IM_COLD | IM_POIS |
+F:IM_ACID | IM_ELEC | IM_FIRE | IM_COLD | IM_POIS | HUMAN |
 F:RES_TELE | RES_NETH | RES_WATE | RES_PLAS | RES_NEXU | RES_DISE | NO_FEAR |
 F:NO_STUN | NO_CONF | NO_SLEEP | CAN_SWIM | CAN_FLY | UNIQUE2 | WILD_SHORE |
 F:WILD_OCEAN | WILD_WASTE | WILD_WOOD | WILD_VOLCANO | WILD_MOUNTAIN |
@@ -18912,7 +18913,7 @@ B:HIT:HURT:14d14
 B:HIT:HURT:14d14
 B:HIT:HURT:14d14
 F:DROP_CORPSE | FORCE_SLEEP | FORCE_MAXHP |
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD |
+F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | HUMAN |
 F:REFLECTING | SMART | REGENERATE | OPEN_DOOR |
 F:IM_COLD | IM_FIRE | IM_ELEC | NO_CONF | NO_STUN |
 F:NO_SLEEP | RES_TELE | RES_NETH | CAN_FLY | POWERFUL |
@@ -18933,7 +18934,7 @@ B:HIT:BLIND:8d8
 B:HIT:CONFUSE:8d8
 B:TOUCH:UN_BONUS:6d6
 B:TOUCH:UN_BONUS:6d6
-F:UNIQUE | MALE | DROP_CORPSE | FORCE_SLEEP | FORCE_MAXHP |
+F:UNIQUE | MALE | DROP_CORPSE | FORCE_SLEEP | FORCE_MAXHP | HUMAN |
 F:ONLY_ITEM | DROP_1D2 | DROP_3D2 | DROP_GOOD | CAN_SWIM |
 F:GOOD | EVIL | REFLECTING | SMART | REGENERATE | OPEN_DOOR | CAN_SPEAK |
 F:IM_COLD | IM_FIRE | IM_ELEC | IM_ACID | IM_POIS | NO_CONF | NO_STUN |
@@ -18956,7 +18957,7 @@ B:HIT:BLIND:10d13
 B:HIT:CONFUSE:10d13
 B:HIT:HURT:13d13
 B:HIT:HURT:13d13
-F:UNIQUE | MALE | DROP_CORPSE | FORCE_SLEEP | FORCE_MAXHP |
+F:UNIQUE | MALE | DROP_CORPSE | FORCE_SLEEP | FORCE_MAXHP | HUMAN |
 F:ONLY_ITEM | DROP_1D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD |
 F:REFLECTING | SMART | REGENERATE | OPEN_DOOR | CAN_SPEAK |
 F:EVIL | IM_COLD | IM_FIRE | IM_ELEC | NO_CONF | NO_STUN |
@@ -18980,7 +18981,7 @@ B:HIT:BLIND:8d8
 B:HIT:CONFUSE:8d8
 B:TOUCH:DR_MANA:4d10
 B:TOUCH:UN_POWER
-F:UNIQUE | MALE | DROP_CORPSE | FORCE_SLEEP | FORCE_MAXHP |
+F:UNIQUE | MALE | DROP_CORPSE | FORCE_SLEEP | FORCE_MAXHP | HUMAN |
 F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | CAN_SPEAK |
 F:REFLECTING | SMART | REGENERATE | OPEN_DOOR |
 F:EVIL | IM_COLD | IM_FIRE | IM_ELEC | NO_CONF | NO_STUN |
@@ -19003,7 +19004,7 @@ B:HIT:HURT:13d13
 B:HIT:HURT:13d13
 B:HIT:HURT:13d13
 B:HIT:HURT:13d13
-F:UNIQUE | MALE | DROP_CORPSE | FORCE_SLEEP | FORCE_MAXHP |
+F:UNIQUE | MALE | DROP_CORPSE | FORCE_SLEEP | FORCE_MAXHP | HUMAN |
 F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | CAN_SPEAK |
 F:REFLECTING | SMART | REGENERATE | OPEN_DOOR |
 F:EVIL | IM_COLD | IM_FIRE | IM_ELEC | NO_CONF | NO_STUN |
@@ -19045,7 +19046,7 @@ B:PUNCH:HURT:15d15
 B:PUNCH:TERRIFY:30d1
 B:KICK:SUPERHURT:15d15
 F:UNIQUE | MALE | CAN_SPEAK | SMART | REFLECTING | HAS_LITE_2 |
-F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | DROP_SKELETON |
+F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | DROP_SKELETON | HUMAN |
 F:FORCE_SLEEP | FORCE_MAXHP | NO_CONF | NO_SLEEP |
 F:DROP_2D2 | DROP_1D2 | DROP_GOOD | ONLY_ITEM | CAN_SWIM |
 F:GOOD | IM_COLD | IM_POIS | IM_ACID | IM_ELEC | IM_FIRE | REGENERATE |
@@ -19081,7 +19082,7 @@ W:28:1:0:240:6000:699
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
-F:MALE | 
+F:MALE | HUMAN |
 F:FORCE_SLEEP | DROP_1D2 | 
 F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE
 F:GOOD
@@ -19250,7 +19251,7 @@ W:25:3:0:500:0:0
 B:HIT:HURT:5d10
 B:HIT:HURT:5d10
 B:CRUSH:SUPERHURT:30d2
-F:UNIQUE | FORCE_MAXHP | CAN_SPEAK |
+F:UNIQUE | FORCE_MAXHP | CAN_SPEAK | HUMAN |
 F:EVIL | ONLY_ITEM | DROP_1D2 | DROP_60 | DROP_GOOD |
 F:NO_SLEEP | NO_CONF | BASH_DOOR
 
@@ -19263,7 +19264,7 @@ B:HIT:POISON:3d6
 B:HIT:POISON:3d6
 B:TOUCH:EAT_GOLD
 B:TOUCH:EAT_ITEM
-F:UNIQUE | FORCE_MAXHP | CAN_SPEAK |
+F:UNIQUE | FORCE_MAXHP | CAN_SPEAK | HUMAN |
 F:EVIL | ONLY_ITEM | DROP_2D2 | DROP_GOOD |
 F:NO_SLEEP | NO_CONF | OPEN_DOOR | MOVE_BODY |
 S:1_IN_2 |
@@ -19281,7 +19282,7 @@ B:TOUCH:UN_POWER
 F:UNIQUE | FORCE_MAXHP | EVIL | GOOD | FORCE_SLEEP | CAN_SPEAK | MALE |
 F:ONLY_ITEM | DROP_3D2 | DROP_2D2 | DROP_GOOD | HAS_LITE_2 |
 F:IM_FIRE | IM_COLD | IM_ELEC | IM_ACID | IM_POIS |
-F:RES_WATE | RES_NETH | RES_DISE |
+F:RES_WATE | RES_NETH | RES_DISE | HUMAN |
 F:NO_SLEEP | NO_CONF | OPEN_DOOR | CAN_SWIM | REGENERATE |
 S:1_IN_5 |
 S:BO_MANA | BA_FIRE | BA_COLD | BA_ELEC | BA_ACID | BO_ICEE | BO_PLAS |
@@ -19465,7 +19466,7 @@ B:PUNCH:HURT:4d12
 B:PUNCH:HURT:5d12
 B:PUNCH:BLIND:20d1
 B:KICK:HURT:8d8
-F:UNIQUE | MALE | CAN_SPEAK | REFLECTING | HAS_LITE_2 |
+F:UNIQUE | MALE | CAN_SPEAK | REFLECTING | HAS_LITE_2 | HUMAN |
 F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | DROP_SKELETON |
 F:FORCE_SLEEP | FORCE_MAXHP | MOVE_BODY | TAKE_ITEM |
 F:DROP_1D2 | DROP_90 | DROP_GOOD | ONLY_ITEM | CAN_SWIM |
@@ -19512,7 +19513,7 @@ B:HIT:HURT:3d7
 B:HIT:HURT:3d7
 B:HIT:HURT:3d7
 F:UNIQUE | MALE | DROP_SKELETON | DROP_CORPSE |
-F:FORCE_SLEEP | FORCE_MAXHP | HAS_LITE_2 |
+F:FORCE_SLEEP | FORCE_MAXHP | HAS_LITE_2 | HUMAN |
 F:DROP_2D2 | ONLY_ITEM | DROP_GOOD |
 F:OPEN_DOOR | GOOD | CAN_SWIM | CAN_FLY |
 F:NO_CONF | NO_SLEEP | FRIENDLY | TAKE_ITEM |
@@ -19529,7 +19530,7 @@ B:SHOW:CONFUSE
 B:SHOW:CONFUSE
 B:HIT:HURT:4d5
 B:CRUSH:HURT:20d2
-F:UNIQUE | MALE | DROP_SKELETON | DROP_CORPSE |
+F:UNIQUE | MALE | DROP_SKELETON | DROP_CORPSE | HUMAN |
 F:FORCE_SLEEP | FORCE_MAXHP | HAS_LITE_2 |
 F:DROP_2D2 | ONLY_GOLD |
 F:OPEN_DOOR | BASH_DOOR | TAKE_ITEM | MOVE_BODY |
@@ -19647,7 +19648,7 @@ B:HIT:HURT:8d15
 B:HIT:HURT:8d15
 B:HIT:SUPERHURT:8d15
 B:HIT:SUPERHURT:8d15
-F:UNIQUE | MALE | FORCE_MAXHP | DROP_60 | DROP_GOOD |
+F:UNIQUE | MALE | FORCE_MAXHP | DROP_60 | DROP_GOOD | HUMAN |
 F:DROP_1D2 | OPEN_DOOR | BASH_DOOR | SMART | POWERFUL | IM_FIRE |
 F:TAKE_ITEM | CAN_SPEAK | EVIL | NO_FEAR | NO_CONF | NO_SLEEP | 
 F:CAN_SWIM | DROP_CORPSE | AURA_FIRE | HAS_LITE_2 |
@@ -19663,7 +19664,7 @@ B:HIT:HURT:8d8
 B:HIT:HURT:8d8
 B:HIT:SUPERHURT:8d8
 B:HIT:SUPERHURT:8d8
-F:UNIQUE | MALE | FORCE_MAXHP | DROP_60 | DROP_GOOD | EVIL |
+F:UNIQUE | MALE | FORCE_MAXHP | DROP_60 | DROP_GOOD | EVIL | HUMAN |
 F:DROP_1D2 | OPEN_DOOR | BASH_DOOR | SMART | POWERFUL | IM_FIRE |
 F:TAKE_ITEM | CAN_SPEAK | NO_FEAR | NO_CONF | NO_SLEEP | 
 F:CAN_SWIM | DROP_CORPSE | AURA_FIRE | HAS_LITE_2 |
@@ -19743,6 +19744,7 @@ B:HIT:HURT:4d12
 B:HIT:HURT:4d12
 B:HIT:HURT:4d12
 B:HIT:HURT:4d12
+F:HUMAN |
 F:FORCE_SLEEP | FORCE_MAXHP | UNIQUE | CAN_SPEAK | DROP_CORPSE | HAS_LITE_2 |
 F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_GOOD | DROP_SKELETON | DROP_CORPSE
 F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | MOVE_BODY
@@ -20112,7 +20114,7 @@ I:115:40d15:20:80:0
 W:30:255:0:500:0:0
 B:HIT:SUPERHURT:4d8
 B:HIT:SUPERHURT:4d8
-F:MALE | DROP_CORPSE | DROP_SKELETON | FORCE_MAXHP | HAS_LITE_2 |
+F:MALE | DROP_CORPSE | DROP_SKELETON | FORCE_MAXHP | HAS_LITE_2 | HUMAN |
 F:OPEN_DOOR | BASH_DOOR | NO_FEAR | UNIQUE2
 D:$He is always traveling togather with 
 D:$Mitsukuni of the Yellow Gate, Grand Duke of Mito
@@ -20125,7 +20127,7 @@ I:115:40d15:20:80:0
 W:30:255:0:500:0:0
 B:HIT:SUPERHURT:4d8
 B:HIT:SUPERHURT:4d8
-F:MALE | DROP_CORPSE | DROP_SKELETON | FORCE_MAXHP | HAS_LITE_2 |
+F:MALE | DROP_CORPSE | DROP_SKELETON | FORCE_MAXHP | HAS_LITE_2 | HUMAN |
 F:OPEN_DOOR | BASH_DOOR | NO_FEAR | UNIQUE2
 D:$He is always traveling togather with 
 D:$Mitsukuni of the Yellow Gate, Grand Duke of Mito
@@ -20158,7 +20160,7 @@ W:35:3:0:1800:0:0
 B:HIT:HURT:4d5
 B:HIT:HURT:4d5
 B:HIT:HURT:4d5
-F:UNIQUE | MALE | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE |
+F:UNIQUE | MALE | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE | HUMAN |
 F:FORCE_SLEEP | FORCE_MAXHP | HAS_LITE_1 |
 F:DROP_1D2 | ONLY_ITEM | DROP_GOOD |
 F:OPEN_DOOR | GOOD | CAN_SWIM |
@@ -20181,7 +20183,7 @@ B:HIT:HURT:4d5
 B:HIT:HURT:4d5
 F:UNIQUE | MALE | CAN_SPEAK | HAS_LITE_2 |
 F:FORCE_SLEEP | FORCE_MAXHP | SMART | DROP_CORPSE | DROP_SKELETON 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_GOOD |
+F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_GOOD | HUMAN |
 F:OPEN_DOOR | BASH_DOOR | 
 F:IM_ACID | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP | EVIL
 S:1_IN_2 | CAUSE_3 | BA_FIRE | HOLD | BLIND | CONF | SCARE
@@ -20231,7 +20233,7 @@ B:HIT:HURT:2d6
 B:HIT:HURT:2d6
 B:HIT:HURT:2d5
 F:MALE | DROP_CORPSE | DROP_SKELETON | HAS_LITE_2 |
-F:FORCE_SLEEP | FORCE_MAXHP | 
+F:FORCE_SLEEP | FORCE_MAXHP | HUMAN |
 F:ONLY_ITEM | DROP_1D2 | 
 F:SMART | OPEN_DOOR | BASH_DOOR | 
 F:EVIL
@@ -20324,7 +20326,7 @@ W:38:4:0:4000:0:0
 B:HIT:HURT:8d4
 B:KICK:HURT:8d4
 F:MALE | FORCE_MAXHP | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE
-F:NO_CONF | NO_SLEEP | NO_STUN | NO_FEAR | HAS_LITE_2 |
+F:NO_CONF | NO_SLEEP | NO_STUN | NO_FEAR | HAS_LITE_2 | HUMAN |
 F:RES_TELE | RAND_50 | ESCORT | IM_FIRE |
 F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | UNIQUE |
 F:OPEN_DOOR | EVIL | BASH_DOOR | SMART
@@ -20344,7 +20346,7 @@ B:KICK:HURT:18d2
 B:KICK:HURT:30d1
 B:CRUSH:FIRE:8d8
 F:MALE | FORCE_MAXHP | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE
-F:NO_CONF | NO_SLEEP |
+F:NO_CONF | NO_SLEEP | HUMAN |
 F:RES_TELE |
 F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | UNIQUE |
 F:OPEN_DOOR | EVIL | BASH_DOOR | SMART | CAN_FLY
@@ -20407,7 +20409,7 @@ B:PUNCH:HURT:15d15
 B:PUNCH:HURT:15d15
 B:PUNCH:TERRIFY:30d1
 B:KICK:SUPERHURT:15d15
-F:UNIQUE | MALE | CAN_SPEAK | SMART | REFLECTING | HAS_LITE_2 |
+F:UNIQUE | MALE | CAN_SPEAK | SMART | REFLECTING | HAS_LITE_2 | HUMAN |
 F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | DROP_SKELETON |
 F:FORCE_SLEEP | FORCE_MAXHP | NO_CONF | NO_SLEEP |
 F:DROP_2D2 | DROP_1D2 | DROP_GOOD | ONLY_ITEM | CAN_SWIM |
@@ -20461,7 +20463,7 @@ B:HIT:EAT_GOLD:1d9
 B:HIT:EAT_GOLD:1d9
 B:TOUCH:EAT_ITEM
 B:TOUCH:EAT_ITEM
-F:UNIQUE | FEMALE | FORCE_SLEEP | FORCE_MAXHP | CAN_SPEAK | FRIENDLY |
+F:UNIQUE | FEMALE | FORCE_SLEEP | FORCE_MAXHP | CAN_SPEAK | FRIENDLY | HUMAN |
 F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | DROP_GREAT | WILD_GRASS |
 F:TAKE_ITEM | OPEN_DOOR | CAN_SWIM | DROP_SKELETON | DROP_CORPSE
 S:1_IN_3
@@ -20479,7 +20481,7 @@ B:PUNCH:HURT:10d8
 B:HIT:SHATTER:10d10
 F:UNIQUE | MALE | CAN_SPEAK | RES_TELE
 F:DROP_SKELETON | DROP_CORPSE
-F:FORCE_SLEEP | FORCE_MAXHP | KILL_WALL |
+F:FORCE_SLEEP | FORCE_MAXHP | KILL_WALL | HUMAN |
 F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | MOVE_BODY |
 F:EVIL | REGENERATE |
 F:OPEN_DOOR | BASH_DOOR |
@@ -20513,7 +20515,7 @@ B:HIT:EAT_ITEM:5d5
 B:HIT:EAT_ITEM:5d5
 B:HIT:EAT_GOLD:5d5
 B:HIT:EAT_GOLD:5d5
-F:MALE | DROP_2D2 |
+F:MALE | DROP_2D2 | HUMAN |
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR |
 F:EVIL |
 S:1_IN_2 |
@@ -20556,7 +20558,7 @@ B:HIT:HURT:6d8
 B:HIT:HURT:6d8
 B:HIT:HURT:6d8
 B:TOUCH:DR_MANA:6d8
-F:MALE |
+F:MALE | HUMAN |
 F:FORCE_SLEEP | FORCE_MAXHP |
 F:ONLY_ITEM | DROP_4D2 | DROP_GOOD |
 F:OPEN_DOOR | BASH_DOOR | TAKE_ITEM |
@@ -20626,7 +20628,7 @@ B:HIT:HURT:1d15
 B:HIT:HURT:1d15
 B:HIT:HURT:1d15
 B:HIT:HURT:1d15
-F:UNIQUE | MALE | EVIL | HAS_LITE_2 |
+F:UNIQUE | MALE | EVIL | HAS_LITE_2 | HUMAN |
 F:FORCE_MAXHP | CAN_SPEAK | WILD_ALL | DROP_SKELETON | DROP_CORPSE
 F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
 F:OPEN_DOOR | BASH_DOOR
@@ -20664,7 +20666,7 @@ W:51:3:0:16000:0:0
 B:INSULT
 B:INSULT
 F:UNIQUE | FEMALE | CAN_SPEAK | DROP_CORPSE
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_SWIM | ELDRITCH_HORROR |
+F:FORCE_SLEEP | FORCE_MAXHP | CAN_SWIM | ELDRITCH_HORROR | HUMAN |
 F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_GOOD | 
 F:SMART | OPEN_DOOR | BASH_DOOR | SELF_LITE_2 |
 F:EVIL | IM_ACID | IM_FIRE | IM_POIS | NO_CONF | NO_SLEEP
@@ -20747,7 +20749,7 @@ B:HIT:HURT:10d5
 B:HIT:HURT:10d5
 B:HIT:HURT:10d5
 B:HIT:HURT:10d5
-F:MALE | FORCE_MAXHP |
+F:MALE | FORCE_MAXHP | HUMAN |
 F:ONLY_ITEM | DROP_90 | DROP_2D2 | 
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | SMART |
 F:GOOD | NO_SLEEP | NO_FEAR | HAS_LITE_1 |
@@ -20771,7 +20773,7 @@ I:110:15d11:20:40:40
 W:20:1:0:55:800:938
 B:HIT:HURT:4d5
 B:HIT:HURT:4d5
-F:MALE | 
+F:MALE | HUMAN |
 F:DROP_1D2 | 
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
 S:1_IN_4 | 
@@ -20788,7 +20790,7 @@ W:20:1:0:55:0:0
 B:SHOOT:HURT:5d6
 B:HIT:HURT:5d4
 B:HIT:HURT:5d4
-F:MALE | 
+F:MALE | HUMAN |
 F:DROP_1D2 | 
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR 
 S:1_IN_4 | 
@@ -20909,7 +20911,7 @@ B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
-F:UNIQUE | MALE | 
+F:UNIQUE | MALE | HUMAN |
 F:FORCE_MAXHP | HAS_LITE_1 | DROP_SKELETON | DROP_CORPSE |
 F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
@@ -20928,7 +20930,7 @@ B:KICK:SUPERHURT:9d4
 B:HIT:SUPERHURT:9d1
 F:MALE | DROP_60 | DROP_1D2 | OPEN_DOOR | BASH_DOOR | IM_ELEC | HAS_LITE_2 |
 F:IM_FIRE | IM_COLD | IM_POIS | IM_ACID | NO_FEAR | NO_CONF | NO_SLEEP | 
-F:DROP_CORPSE | DROP_SKELETON
+F:HUMAN | DROP_CORPSE | DROP_SKELETON
 S:1_IN_9 | 
 S:HASTE
 D:$A yellow-garbed monk, trained in martial arts.
@@ -21036,7 +21038,7 @@ G:p:y
 I:110:6d8:20:10:5
 W:4:1:0:18:600:1055
 B:HIT:HURT:1d9
-F:DROP_60 | WILD_ALL |
+F:DROP_60 | WILD_ALL | HUMAN |
 F:OPEN_DOOR | DROP_SKELETON | DROP_CORPSE | 
 F:HAS_LITE_1 | NO_CONF | NO_SLEEP
 S:1_IN_12 |
@@ -21050,7 +21052,7 @@ G:p:y
 I:110:6d8:20:10:5
 W:8:1:0:18:600:1055
 B:HIT:HURT:1d6
-F:DROP_60 | WILD_ALL | FRIENDS | 
+F:DROP_60 | WILD_ALL | FRIENDS | HUMAN |
 F:OPEN_DOOR | DROP_SKELETON | DROP_CORPSE | 
 F:HAS_LITE_1 | NO_CONF | NO_SLEEP
 S:1_IN_12 |
@@ -21066,7 +21068,7 @@ W:22:2:0:50:5000:1056
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
 F:MALE | 
-F:FORCE_SLEEP | DROP_90 | WILD_ALL | 
+F:FORCE_SLEEP | DROP_90 | WILD_ALL | HUMAN |
 F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
 F:EVIL | HAS_LITE_2
 S:1_IN_4 | 
@@ -21084,7 +21086,7 @@ B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 F:MALE | ONLY_ITEM | FORCE_SLEEP | FORCE_MAXHP | DROP_4D2 |
-F:SMART | BASH_DOOR | TAKE_ITEM | MOVE_BODY | 
+F:SMART | BASH_DOOR | TAKE_ITEM | MOVE_BODY | HUMAN |
 F:EVIL | IM_FIRE | IM_ELEC | IM_POIS |
 F:NO_CONF | NO_SLEEP | NO_STUN | NO_FEAR
 S:1_IN_2 | 
@@ -21157,7 +21159,7 @@ G:T:G
 I:109:35d20:50:15:4
 W:0:255:0:0:0:0
 B:HIT:HURT:1d3
-F:UNIQUE | MALE | GIANT | CAN_SPEAK |
+F:UNIQUE | MALE | GIANT | CAN_SPEAK | HUMAN |
 F:FORCE_MAXHP | DROP_CORPSE | WILD_TOWN | WILD_ONLY
 #F:ONLY_ITEM | DROP_90 | DROP_GOOD | FRIENDLY |
 F:OPEN_DOOR | BASH_DOOR | HAS_LITE_1 |
@@ -21211,7 +21213,7 @@ B:STING:HURT:1d5
 B:STING:HURT:1d5
 B:BITE:HURT:1d5
 B:BITE:LOSE_CHR:1d5
-F:UNIQUE | MALE | CAN_SPEAK |
+F:UNIQUE | MALE | CAN_SPEAK | HUMAN |
 F:RAND_50 | RAND_25 | FORCE_MAXHP | 
 F:DROP_CORPSE | CAN_FLY | WEIRD_MIND |
 F:ANIMAL |
diff --git a/src/artifact.c b/src/artifact.c
index 76e7a3865..91be19c83 100644
--- a/src/artifact.c
+++ b/src/artifact.c
@@ -1025,7 +1025,7 @@ static void random_slay(object_type *o_ptr)
 		break;
 	}
 
-	switch (randint1(34))
+	switch (randint1(36))
 	{
 		case 1:
 		case 2:
@@ -1128,6 +1128,10 @@ static void random_slay(object_type *o_ptr)
 			if (!artifact_bias)
 				artifact_bias = (one_in_(2) ? BIAS_MAGE : BIAS_PRIESTLY);
 			break;
+		case 33:
+		case 34:
+			o_ptr->art_flags3 |= TR3_SLAY_HUMAN;
+			break;
 		default:
 			o_ptr->art_flags1 |= TR1_CHAOTIC;
 			if (!artifact_bias)
@@ -1748,6 +1752,7 @@ bool create_artifact(object_type *o_ptr, bool a_scroll)
 		o_ptr->art_flags1 &= ~(TR1_SLAY_GIANT);
 		o_ptr->art_flags1 &= ~(TR1_SLAY_DRAGON);
 		o_ptr->art_flags1 &= ~(TR1_KILL_DRAGON);
+		o_ptr->art_flags3 &= ~(TR3_SLAY_HUMAN);
 		o_ptr->art_flags1 &= ~(TR1_VORPAL);
 		o_ptr->art_flags1 &= ~(TR1_BRAND_POIS);
 		o_ptr->art_flags1 &= ~(TR1_BRAND_ACID);
@@ -2938,7 +2943,11 @@ void random_artifact_resistance(object_type * o_ptr, artifact_type *a_ptr)
 		int dummy, i;
 		dummy = randint1(2)+randint1(2);
 		for (i = 0; i < dummy; i++)
-			o_ptr->art_flags1 |= (TR1_CHAOTIC << randint0(18));
+		{
+			int flag = randint0(19);
+			if (flag == 18) o_ptr->art_flags3 |= TR3_SLAY_HUMAN;
+			else o_ptr->art_flags1 |= (TR1_CHAOTIC << flag);
+		}
 		dummy = randint1(2);
 		for (i = 0; i < dummy; i++)
 			one_resistance(o_ptr);
diff --git a/src/birth.c b/src/birth.c
index bfde9cec8..046d93c6f 100644
--- a/src/birth.c
+++ b/src/birth.c
@@ -5395,6 +5395,8 @@ static bool player_birth_aux(void)
 
 			if(!(r_ptr->flags1 & RF1_UNIQUE)) continue;
 
+			if(r_ptr->flags1 & RF1_QUESTOR) continue;
+
 			if(r_ptr->flags6 & RF6_SPECIAL) continue;
 
 			if(r_ptr->flags7 & RF7_FRIENDLY) continue;
diff --git a/src/bldg.c b/src/bldg.c
index 720fafd8d..03184c2ba 100644
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -3083,6 +3083,7 @@ static void compare_weapon_aux1(object_type *o_ptr, int col, int r)
 if (f1 & TR1_FORCE_WEAPON)     compare_weapon_aux2(o_ptr, p_ptr->num_blow[0], r++, col, 1*mult, "ÍýÎÏ:", f1, f2, f3, TERM_L_BLUE);
 if (f1 & TR1_SLAY_ANIMAL) compare_weapon_aux2(o_ptr, p_ptr->num_blow[0], r++, col, 2*mult, "ưʪ:", f1, f2, f3, TERM_YELLOW);
 if (f1 & TR1_SLAY_EVIL)   compare_weapon_aux2(o_ptr, p_ptr->num_blow[0], r++, col, 2*mult, "¼Ù°­:", f1, f2, f3, TERM_YELLOW);
+if (f3 & TR3_SLAY_HUMAN)   compare_weapon_aux2(o_ptr, p_ptr->num_blow[0], r++, col, 2*mult, "¿Í´Ö:", f1, f2, f3, TERM_YELLOW);
 if (f1 & TR1_SLAY_UNDEAD) compare_weapon_aux2(o_ptr, p_ptr->num_blow[0], r++, col, 3*mult, "ÉÔ»à:", f1, f2, f3, TERM_YELLOW);
 if (f1 & TR1_SLAY_DEMON)  compare_weapon_aux2(o_ptr, p_ptr->num_blow[0], r++, col, 3*mult, "°­Ëâ:", f1, f2, f3, TERM_YELLOW);
 if (f1 & TR1_SLAY_ORC)    compare_weapon_aux2(o_ptr, p_ptr->num_blow[0], r++, col, 3*mult, "¥ª¡¼¥¯:", f1, f2, f3, TERM_YELLOW);
@@ -3099,6 +3100,7 @@ if (f1 & TR1_BRAND_POIS)  compare_weapon_aux2(o_ptr, p_ptr->num_blow[0], r++, co
 	if (f1 & TR1_FORCE_WEAPON)     compare_weapon_aux2(o_ptr, p_ptr->num_blow[0], r++, col, 1*mult, "Force  :", f1, f2, f3, TERM_L_BLUE);
 	if (f1 & TR1_SLAY_ANIMAL) compare_weapon_aux2(o_ptr, p_ptr->num_blow[0], r++, col, 2*mult, "Animals:", f1, f2, f3, TERM_YELLOW);
 	if (f1 & TR1_SLAY_EVIL)   compare_weapon_aux2(o_ptr, p_ptr->num_blow[0], r++, col, 2*mult, "Evil:", f1, f2, f3, TERM_YELLOW);
+	if (f3 & TR3_SLAY_HUMAN)   compare_weapon_aux2(o_ptr, p_ptr->num_blow[0], r++, col, 2*mult, "Human:", f1, f2, f3, TERM_YELLOW);
 	if (f1 & TR1_SLAY_UNDEAD) compare_weapon_aux2(o_ptr, p_ptr->num_blow[0], r++, col, 3*mult, "Undead:", f1, f2, f3, TERM_YELLOW);
 	if (f1 & TR1_SLAY_DEMON)  compare_weapon_aux2(o_ptr, p_ptr->num_blow[0], r++, col, 3*mult, "Demons:", f1, f2, f3, TERM_YELLOW);
 	if (f1 & TR1_SLAY_ORC)    compare_weapon_aux2(o_ptr, p_ptr->num_blow[0], r++, col, 3*mult, "Orcs:", f1, f2, f3, TERM_YELLOW);
diff --git a/src/cmd1.c b/src/cmd1.c
index 16bb7a8de..73415d9bd 100644
--- a/src/cmd1.c
+++ b/src/cmd1.c
@@ -262,6 +262,18 @@ s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, int mode)
 				if (mult < 20) mult = 20;
 			}
 
+			/* Slay Human */
+			if ((f3 & TR3_SLAY_HUMAN) &&
+			    (r_ptr->flags2 & RF2_HUMAN))
+			{
+				if (m_ptr->ml)
+				{
+					r_ptr->r_flags2 |= RF2_HUMAN;
+				}
+
+				if (mult < 20) mult = 20;
+			}
+
 			/* Slay Undead */
 			if ((f1 & TR1_SLAY_UNDEAD) &&
 			    (r_ptr->flags3 & RF3_UNDEAD))
@@ -2582,6 +2594,8 @@ static void py_attack_aux(int y, int x, bool *fear, bool *mdeath, s16b hand, int
 		/* Test for hit */
 		if (success_hit)
 		{
+			int vorpal_chance = ((o_ptr->name1 == ART_VORPAL_BLADE) || (o_ptr->name1 == ART_CHAINSWORD)) ? 2 : 4;
+
 			/* Sound */
 			sound(SOUND_HIT);
 
@@ -2669,7 +2683,7 @@ static void py_attack_aux(int y, int x, bool *fear, bool *mdeath, s16b hand, int
 					can_drain = FALSE;
 			}
 
-			if ((f1 & TR1_VORPAL) && (randint1((o_ptr->name1 == ART_VORPAL_BLADE) ? 3 : 6) == 1) && !zantetsu_mukou)
+			if ((f1 & TR1_VORPAL) && (randint1(vorpal_chance*3/2) == 1) && !zantetsu_mukou)
 				vorpal_cut = TRUE;
 			else vorpal_cut = FALSE;
 
@@ -2880,8 +2894,6 @@ static void py_attack_aux(int y, int x, bool *fear, bool *mdeath, s16b hand, int
 				{
 					int mult = 2;
 
-					int inc_chance = (o_ptr->name1 == ART_VORPAL_BLADE) ? 2 : 4;
-
 					if ((o_ptr->name1 == ART_CHAINSWORD) && !one_in_(2))
 					{
 						char chainsword_noise[1024];
@@ -2916,7 +2928,7 @@ static void py_attack_aux(int y, int x, bool *fear, bool *mdeath, s16b hand, int
 					}
 
 					/* Try to increase the damage */
-					while (one_in_(inc_chance))
+					while (one_in_(vorpal_chance))
 					{
 						mult++;
 					}
diff --git a/src/cmd2.c b/src/cmd2.c
index e232246c1..b37c1021d 100644
--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -3285,6 +3285,18 @@ s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr)
 				if (mult < 15) mult = 15;
 			}
 
+			/* Slay Human */
+			if ((f3 & TR3_SLAY_HUMAN) &&
+			    (r_ptr->flags2 & RF2_HUMAN))
+			{
+				if (m_ptr->ml)
+				{
+					r_ptr->r_flags2 |= RF2_HUMAN;
+				}
+
+				if (mult < 17) mult = 17;
+			}
+
 			/* Slay Undead */
 			if ((f1 & TR1_SLAY_UNDEAD) &&
 			    (r_ptr->flags3 & RF3_UNDEAD))
diff --git a/src/cmd3.c b/src/cmd3.c
index 023bcbdd9..93368aa9b 100644
--- a/src/cmd3.c
+++ b/src/cmd3.c
@@ -1396,6 +1396,7 @@ static flag_insc_table flag_insc_brand[] =
 static flag_insc_table flag_insc_slay[] =
 {
 	{ "¼Ù", "*", TR1_SLAY_EVIL, 1, 0 },
+	{ "¿Í", "H", TR3_SLAY_HUMAN, 3, 0 },
 	{ "ζ", "D", TR1_KILL_DRAGON, 1, 0 },
 	{ "ε", "d", TR1_SLAY_DRAGON, 1, TR1_KILL_DRAGON },
 	{ "¥ª", "o", TR1_SLAY_ORC, 1, 0 },
@@ -1523,6 +1524,7 @@ static flag_insc_table flag_insc_brand[] =
 static flag_insc_table flag_insc_slay[] =
 {
   	{ "*", TR1_SLAY_EVIL, 1, 0 },
+	{ "H", TR3_SLAY_HUMAN, 3, 0 },
   	{ "D", TR1_KILL_DRAGON, 1, 0 },
   	{ "d", TR1_SLAY_DRAGON, 1, TR1_KILL_DRAGON },
   	{ "o", TR1_SLAY_ORC, 1, 0 },
diff --git a/src/cmd5.c b/src/cmd5.c
index a8a929dfa..a780dcb31 100644
--- a/src/cmd5.c
+++ b/src/cmd5.c
@@ -3583,7 +3583,7 @@ msg_print("
 		return enchant_spell(0, 0, randint0(3) + 2);
 		break;
 	case 29: /* Brand Weapon */
-		brand_weapon(randint0(17));
+		brand_weapon(randint0(18));
 		break;
 	case 30: /* Living Trump */
 		if (one_in_(7))
diff --git a/src/cmd6.c b/src/cmd6.c
index e8e11a4d4..4b6b68d6f 100644
--- a/src/cmd6.c
+++ b/src/cmd6.c
@@ -5494,7 +5494,11 @@ msg_print("
 				o_ptr->art_flags2 = a_info[ART_BLOOD].flags2;
 				dummy = randint1(2)+randint1(2);
 				for (i = 0; i < dummy; i++)
-					o_ptr->art_flags1 |= (TR1_CHAOTIC << randint0(18));
+				{
+					int flag = randint0(19);
+					if (flag == 18) o_ptr->art_flags3 |= TR3_SLAY_HUMAN;
+					else o_ptr->art_flags1 |= (TR1_CHAOTIC << flag);
+				}
 				dummy = randint1(2);
 				for (i = 0; i < dummy; i++)
 					one_resistance(o_ptr);
diff --git a/src/defines.h b/src/defines.h
index 752b8a8c0..d349c10e0 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -1450,7 +1450,7 @@
 #define EGO_TRUMP               98
 #define EGO_PATTERN             99
 #define EGO_DIGGING             100
-/* xxx */
+#define EGO_SLAY_HUMAN          101
 #define EGO_MORGUL              102
 /* xxx */
 
@@ -2962,7 +2962,7 @@
 
 #define TR3_SH_FIRE             0x00000001L     /* Immolation (Fire) */
 #define TR3_SH_ELEC             0x00000002L     /* Electric Sheath */
-#define TR3_XXX1                0x00000004L     /* quest level item -KMW- */
+#define TR3_SLAY_HUMAN          0x00000004L     /* Slay human */
 #define TR3_SH_COLD             0x00000008L     /* cold aura */
 #define TR3_NO_TELE             0x00000010L     /* Anti-teleportation */
 #define TR3_NO_MAGIC            0x00000020L     /* Anti-magic */
@@ -2971,7 +2971,7 @@
 #define TR3_WARNING             0x00000100L     /* Warning */
 #define TR3_HIDE_TYPE           0x00000200L     /* Hide "pval" description */
 #define TR3_SHOW_MODS           0x00000400L     /* Always show Tohit/Todam */
-#define TR3_XXX2                0x00000800L     /* XXX1 */
+#define TR3_XXX1                0x00000800L     /* XXX1 */
 #define TR3_FEATHER             0x00001000L     /* Feather Falling */
 #define TR3_LITE                0x00002000L     /* Permanent Light */
 #define TR3_SEE_INVIS           0x00004000L     /* See Invisible */
@@ -3200,7 +3200,7 @@
 #define RF2_BRAIN_4         0x08000000
 #define RF2_BRAIN_5         0x10000000
 #define RF2_BRAIN_6         0x20000000
-#define RF2_BRAIN_7         0x40000000
+#define RF2_HUMAN           0x40000000
 #define RF2_QUANTUM         0x80000000  /* Monster has quantum behavior */
 
 /*
diff --git a/src/files.c b/src/files.c
index a9499cc52..c48b60834 100644
--- a/src/files.c
+++ b/src/files.c
@@ -2197,7 +2197,7 @@ static void display_player_various(void)
 			if (object_known_p(o_ptr)) damage[i] += o_ptr->to_d*100;
 			basedam = (o_ptr->dd * (o_ptr->ds + 1))*50;
 			object_flags(o_ptr, &f1, &f2, &f3);
-			if ((o_ptr->ident & IDENT_MENTAL) && (o_ptr->name1 == ART_VORPAL_BLADE))
+			if ((o_ptr->ident & IDENT_MENTAL) && ((o_ptr->name1 == ART_VORPAL_BLADE) || (o_ptr->name1 == ART_CHAINSWORD)))
 			{
 				/* vorpal blade */
 				basedam *= 5;
diff --git a/src/hissatsu.c b/src/hissatsu.c
index 0403d65ec..b705f1553 100644
--- a/src/hissatsu.c
+++ b/src/hissatsu.c
@@ -860,7 +860,7 @@ static bool cast_hissatsu_spell(int spell)
 			basedam = (o_ptr->dd * (o_ptr->ds + 1)) * 50;
 			damage = o_ptr->to_d * 100;
 			object_flags(o_ptr, &f1, &f2, &f3);
-			if (o_ptr->name1 == ART_VORPAL_BLADE)
+			if ((o_ptr->name1 == ART_VORPAL_BLADE) || (o_ptr->name1 == ART_CHAINSWORD))
 			{
 				/* vorpal blade */
 				basedam *= 5;
@@ -1126,17 +1126,17 @@ msg_print("
 			basedam = (o_ptr->dd * (o_ptr->ds + 1)) * 50;
 			damage = o_ptr->to_d * 100;
 			object_flags(o_ptr, &f1, &f2, &f3);
-			if (o_ptr->name1 == ART_VORPAL_BLADE)
+			if ((o_ptr->name1 == ART_VORPAL_BLADE) || (o_ptr->name1 == ART_CHAINSWORD))
 			{
 				/* vorpal blade */
-				basedam *= 786;
-				basedam /= 500;
+				basedam *= 5;
+				basedam /= 3;
 			}
 			else if (object_known_p(o_ptr) && (f1 & TR1_VORPAL))
 			{
 				/* vorpal flag only */
-				basedam *= 609;
-				basedam /= 500;
+				basedam *= 11;
+				basedam /= 9;
 			}
 			damage += basedam;
 			damage += p_ptr->to_d[i] * 100;
diff --git a/src/init1.c b/src/init1.c
index 4b4c646b4..71c9b10d8 100644
--- a/src/init1.c
+++ b/src/init1.c
@@ -207,7 +207,7 @@ static cptr r_info_flags2[] =
 	"BRAIN_4",
 	"BRAIN_5",
 	"BRAIN_6",
-	"BRAIN_7",
+	"HUMAN",
 	"QUANTUM"
 };
 
@@ -573,7 +573,7 @@ static cptr k_info_flags3[] =
 {
 	"SH_FIRE",
 	"SH_ELEC",
-	"XXX1",
+	"SLAY_HUMAN",
 	"SH_COLD",
 	"NO_TELE",
 	"NO_MAGIC",
@@ -582,7 +582,7 @@ static cptr k_info_flags3[] =
 	"WARNING",
 	"HIDE_TYPE",
 	"SHOW_MODS",
-	"XXX2",
+	"XXX1",
 	"FEATHER",
 	"LITE",
 	"SEE_INVIS",
diff --git a/src/melee2.c b/src/melee2.c
index 9a98a9d48..a5fe1ac2b 100644
--- a/src/melee2.c
+++ b/src/melee2.c
@@ -3584,6 +3584,7 @@ msg_print("
 				{
 					u32b f1, f2, f3;
 
+					u32b flg2 = 0L;
 					u32b flg3 = 0L;
 
 					char m_name[80];
@@ -3608,9 +3609,10 @@ msg_print("
 					if (f1 & TR1_SLAY_UNDEAD) flg3 |= (RF3_UNDEAD);
 					if (f1 & TR1_SLAY_ANIMAL) flg3 |= (RF3_ANIMAL);
 					if (f1 & TR1_SLAY_EVIL)   flg3 |= (RF3_EVIL);
+					if (f3 & TR3_SLAY_HUMAN)  flg2 |= (RF2_HUMAN);
 
 					/* The object cannot be picked up by the monster */
-					if (artifact_p(o_ptr) || (r_ptr->flags3 & flg3) ||
+					if (artifact_p(o_ptr) || (r_ptr->flags3 & flg3) || (r_ptr->flags2 & flg2) ||
 						(o_ptr->art_name))
 					{
 						/* Only give a message for "take_item" */
diff --git a/src/monster1.c b/src/monster1.c
index b0b8bf7fa..754f3fe47 100644
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -247,6 +247,7 @@ static void roff_aux(int r_idx, int remem)
 		if (r_ptr->flags3 & RF3_GOOD)     flags3 |= (RF3_GOOD);
 		if (r_ptr->flags3 & RF3_ANIMAL)   flags3 |= (RF3_ANIMAL);
 		if (r_ptr->flags3 & RF3_AMBERITE) flags3 |= (RF3_AMBERITE);
+		if (r_ptr->flags2 & RF2_HUMAN)    flags2 |= (RF2_HUMAN);
 
 		/* Know 'quantum' flag */
 		if (r_ptr->flags2 & RF2_QUANTUM)  flags2 |= (RF2_QUANTUM);
@@ -739,9 +740,14 @@ if (flags3 & RF3_UNDEAD)          c_roff(TERM_VIOLET, "
 #else
 		if (flags3 & RF3_UNDEAD)          roff(" undead");
 #endif
+#ifdef JP
+if (flags3 & RF3_AMBERITE)        c_roff(TERM_VIOLET, "¥¢¥ó¥Ð¡¼¤Î²¦Â²¤Î");
+#else
+		if (flags3 & RF3_AMBERITE)        roff(" Amberite");
+#endif
 
 
-	if ((flags3 & (RF3_DRAGON | RF3_DEMON | RF3_GIANT | RF3_TROLL | RF3_ORC | RF3_AMBERITE)) || (flags2 & RF2_QUANTUM))
+	if ((flags3 & (RF3_DRAGON | RF3_DEMON | RF3_GIANT | RF3_TROLL | RF3_ORC)) || (flags2 & (RF2_QUANTUM | RF2_HUMAN)))
 	{
 	/* Describe the "race" */
 #ifdef JP
@@ -775,9 +781,9 @@ if (flags3 & RF3_ORC)      c_roff(TERM_UMBER, "
 #endif
 
 #ifdef JP
-if (flags3 & RF3_AMBERITE) c_roff(TERM_L_WHITE, "¥¢¥ó¥Ð¡¼¤Î²¦Â²");
+if (flags2 & RF2_HUMAN) c_roff(TERM_L_WHITE, "¿Í´Ö");
 #else
-		if (flags3 & RF3_AMBERITE) roff(" Amberite");
+		if (flags2 & RF2_HUMAN) roff(" Human");
 #endif
 
 #ifdef JP
diff --git a/src/object1.c b/src/object1.c
index 484df0194..9c5b98a8b 100644
--- a/src/object1.c
+++ b/src/object1.c
@@ -2943,6 +2943,15 @@ info[i++] = "
 #endif
 
 	}
+	if (f3 & (TR3_SLAY_HUMAN))
+	{
+#ifdef JP
+info[i++] = "¤½¤ì¤Ï¿Í´Ö¤ËÂФ·¤ÆÆä˶²¤ë¤Ù¤­ÎϤòȯ´ø¤¹¤ë¡£";
+#else
+		info[i++] = "It is especially deadly against humans.";
+#endif
+
+	}
 
 	if (f1 & (TR1_FORCE_WEAPON))
 	{
diff --git a/src/object2.c b/src/object2.c
index d00620448..f1ab8a8ec 100644
--- a/src/object2.c
+++ b/src/object2.c
@@ -931,6 +931,7 @@ s32b flag_cost(object_type * o_ptr, int plusses)
 	if (f1 & TR1_FORCE_WEAPON) {tmp_cost += 2500;count++;}
 	if (f1 & TR1_SLAY_ANIMAL) {tmp_cost += 1800;count++;}
 	if (f1 & TR1_SLAY_EVIL) {tmp_cost += 2300;count++;}
+	if (f3 & TR3_SLAY_HUMAN) {tmp_cost += 1800;count++;}
 	if (f1 & TR1_SLAY_UNDEAD) {tmp_cost += 1800;count++;}
 	if (f1 & TR1_SLAY_DEMON) {tmp_cost += 1800;count++;}
 	if (f1 & TR1_SLAY_ORC) {tmp_cost += 1500;count++;}
@@ -2394,6 +2395,10 @@ static void a_m_aux_1(object_type *o_ptr, int level, int power)
 					else
 						o_ptr->pval = m_bonus(3, level);
 					break;
+				case EGO_VAMPIRIC:
+					if (one_in_(5))
+						o_ptr->art_flags3 |= TR3_SLAY_HUMAN;
+					break;
 				}
 
 				if (!o_ptr->art_name)
diff --git a/src/spells2.c b/src/spells2.c
index b6786f85b..3a4ef9cae 100644
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -2850,6 +2850,15 @@ info[i++] = "
 #endif
 
 		}
+		if (f3 & (TR3_SLAY_HUMAN))
+		{
+#ifdef JP
+info[i++] = "¤¢¤Ê¤¿¤ÎÉð´ï¤Ï¿Í´Ö¤ËÂФ·¤ÆÆä˶¯¤¤ÎϤòȯ´ø¤¹¤ë¡£";
+#else
+			info[i++] = "Your weapon is especially deadly against humans.";
+#endif
+
+		}
 		if (f1 & (TR1_SLAY_UNDEAD))
 		{
 #ifdef JP
diff --git a/src/spells3.c b/src/spells3.c
index e6a6d0162..a03597840 100644
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -1219,7 +1219,7 @@ s = "
 
 		switch (brand_type)
 		{
-		case 16:
+		case 17:
 			if (o_ptr->tval == TV_SWORD)
 			{
 #ifdef JP
@@ -1243,6 +1243,15 @@ act = "
 				o_ptr->pval = m_bonus(3, dun_level);
 			}
 			break;
+		case 16:
+#ifdef JP
+act = "¤Ï¿Í´Ö¤Î·ì¤òµá¤á¤Æ¤¤¤ë¡ª";
+#else
+			act = "seems looking for human!";
+#endif
+
+			o_ptr->name2 = EGO_SLAY_HUMAN;
+			break;
 		case 15:
 #ifdef JP
 act = "¤ÏÅÅ·â¤Ëʤ¤ï¤ì¤¿¡ª";
diff --git a/src/wizard1.c b/src/wizard1.c
index d8ae52e89..71ba09863 100644
--- a/src/wizard1.c
+++ b/src/wizard1.c
@@ -634,6 +634,7 @@ static flag_desc slay_flags_desc[] =
 #ifdef JP
 	{ TR1_SLAY_ANIMAL,        "ưʪ" },
 	{ TR1_SLAY_EVIL,          "¼Ù°­" },
+	{ TR3_SLAY_HUMAN,         "¿Í´Ö" },
 	{ TR1_SLAY_UNDEAD,        "¥¢¥ó¥Ç¥Ã¥É" },
 	{ TR1_SLAY_DEMON,         "°­Ëâ" },
 	{ TR1_SLAY_ORC,           "¥ª¡¼¥¯" },
@@ -644,6 +645,7 @@ static flag_desc slay_flags_desc[] =
 #else
 	{ TR1_SLAY_ANIMAL,        "Animal" },
 	{ TR1_SLAY_EVIL,          "Evil" },
+	{ TR3_SLAY_HUMAN,         "Human" },
 	{ TR1_SLAY_UNDEAD,        "Undead" },
 	{ TR1_SLAY_DEMON,         "Demon" },
 	{ TR1_SLAY_ORC,           "Orc" },
@@ -2101,15 +2103,16 @@ if (flags3 & RF3_ANIMAL)          spoil_out("
 if (flags3 & RF3_EVIL)            spoil_out("¼Ù°­¤Ê¤ë");
 if (flags3 & RF3_GOOD)            spoil_out("Á±ÎɤÊ");
 if (flags3 & RF3_UNDEAD)          spoil_out("¥¢¥ó¥Ç¥Ã¥É¤Î");
+if (flags3 & RF3_AMBERITE)        spoil_out("¥¢¥ó¥Ð¡¼¤Î²¦Â²¤Î");
 
-if ((flags3 & (RF3_DRAGON | RF3_DEMON | RF3_GIANT | RF3_TROLL | RF3_ORC | RF3_AMBERITE)) || (flags2 & RF2_QUANTUM))
+if ((flags3 & (RF3_DRAGON | RF3_DEMON | RF3_GIANT | RF3_TROLL | RF3_ORC)) || (flags2 & (RF2_QUANTUM | RF2_HUMAN)))
 {
      if (flags3 & RF3_DRAGON)   spoil_out("¥É¥é¥´¥ó");
      if (flags3 & RF3_DEMON)    spoil_out("¥Ç¡¼¥â¥ó");
      if (flags3 & RF3_GIANT)    spoil_out("¥¸¥ã¥¤¥¢¥ó¥È");
      if (flags3 & RF3_TROLL)    spoil_out("¥È¥í¥ë");
      if (flags3 & RF3_ORC)      spoil_out("¥ª¡¼¥¯");
-     if (flags3 & RF3_AMBERITE) spoil_out("¥¢¥ó¥Ð¡¼¤Î²¦Â²");/*nuke me*/
+     if (flags2 & RF2_HUMAN)    spoil_out("¿Í´Ö");/*nuke me*/
      if (flags2 & RF2_QUANTUM)  spoil_out("ÎÌ»ÒÀ¸Êª");
 }
 else                            spoil_out("¥â¥ó¥¹¥¿¡¼");
@@ -2121,13 +2124,14 @@ else                            spoil_out("
 		if (flags3 & (RF3_EVIL)) spoil_out(" evil");
 		if (flags3 & (RF3_GOOD)) spoil_out(" good");
 		if (flags3 & (RF3_UNDEAD)) spoil_out(" undead");
+		if (flags3 & (RF3_AMBERITE)) spoil_out (" Amberite");
 
 		if (flags3 & (RF3_DRAGON)) spoil_out(" dragon");
 		else if (flags3 & (RF3_DEMON)) spoil_out(" demon");
 		else if (flags3 & (RF3_GIANT)) spoil_out(" giant");
 		else if (flags3 & (RF3_TROLL)) spoil_out(" troll");
 		else if (flags3 & (RF3_ORC)) spoil_out(" orc");
-		else if (flags3 & (RF3_AMBERITE)) spoil_out (" Amberite");
+		else if (flags2 & (RF2_HUMAN)) spoil_out (" Human");
 		else spoil_out(" creature");
 #endif
 
-- 
2.11.0