init_r_info_txt() のMega Hackを無くすように修正。

- RF8_WILD_DUNGEON は RF8_WILD_ONLYに改名。
- WILD_TOO フラグ だけがあって外のWILD_* フラグがないモンスターは全て
  のWILD_* フラグを付けたす処理があったが、他には全くWILD_TOOを使って
  いなかったので r_info_j.txt を書き変えて 換わりに WILD_ALL を導入。

diff --git a/lib/edit/r_info_j.txt b/lib/edit/r_info_j.txt
index 7842f7f..8bda2c8 100644 (file)
--- a/lib/edit/r_info_j.txt
+++ b/lib/edit/r_info_j.txt
@@ -221,7 +221,7 @@ G:f:U
 I:110:1d2:30:1:10
 W:0:3:0:0:5:62
 B:CLAW:HURT:1d3
-F:RAND_25 | WILD_TOO | WILD_GRASS | WILD_TOWN | WILD_ONLY
+F:RAND_25 | WILD_GRASS | WILD_TOWN | WILD_ONLY
 F:ANIMAL | DROP_CORPSE | DROP_SKELETON
 D:$A skinny little furball with sharp claws and a menacing look.
 D:±Ô¤¤ÄޤȰ¥¤ì¤ÊÍÆËƤò»ý¤Ã¤¿¤ä¤»¤³¤±¤¿¾®¤µ¤Ê¥Í¥³¤À¡£
@@ -510,7 +510,7 @@ I:100:3d6:4:30:99
 W:1:1:0:4:5:28
 B:BITE:HURT:1d3
 B:CRUSH:HURT:1d3
-F:RAND_50 | WILD_TOO |
+F:RAND_50 | WILD_ALL |
 F:BASH_DOOR | DROP_SKELETON | DROP_CORPSE
 F:ANIMAL
 D:$It is about eight feet long.
@@ -540,7 +540,7 @@ I:110:2d6:8:12:30
 W:1:1:0:4:0:0
 B:BITE:HURT:1d7
 B:BITE:HURT:1d7
-F:WEIRD_MIND | CAN_SWIM | WILD_TOO | DROP_CORPSE
+F:WEIRD_MIND | CAN_SWIM | DROP_CORPSE
 F:WILD_GRASS | WILD_WASTE | WILD_SHORE | WILD_SWAMP | WILD_MOUNTAIN |
 F:ANIMAL
 D:$A small, harmless lizard.
@@ -555,7 +555,7 @@ W:1:1:0:4:0:0
 B:BITE:HURT:1d5
 B:STING:HURT:1d5
 F:RAND_50 | DROP_SKELETON |
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO |
+F:WEIRD_MIND | BASH_DOOR | WILD_ALL |
 F:ANIMAL
 D:$It is about four feet long and carnivorous.
 D:¤½¤ì¤ÏŤµ¤¬ 1.5 ¥á¡¼¥È¥ë¶á¤¯¤â¤¢¤ëÆù¿©À¸Êª¤À¡£
@@ -598,7 +598,7 @@ G:r:w
 I:110:1d3:8:4:20
 W:1:1:0:3:5:86
 B:BITE:HURT:1d5
-F:RAND_50 | WILD_TOO | WILD_GRASS |
+F:RAND_50 | WILD_GRASS |
 F:MULTIPLY | CAN_SWIM |
 F:ANIMAL | DROP_CORPSE | EAT_CONF
 D:$It is about three feet long with large teeth.
@@ -625,7 +625,7 @@ G:k:G
 I:110:2d7:20:16:10
 W:1:1:0:10:8:30
 B:HIT:HURT:1d9
-F:DROP_60 | WILD_TOO | DROP_SKELETON | DROP_CORPSE
+F:DROP_60 | WILD_ALL | DROP_SKELETON | DROP_CORPSE
 F:OPEN_DOOR | BASH_DOOR | EAT_POISONOUS |
 F:EVIL | IM_POIS
 D:$It is a squat and ugly humanoid figure.
@@ -639,7 +639,7 @@ I:110:5d5:20:16:10
 W:3:1:0:5:14:102
 B:HIT:HURT:1d8
 B:HIT:HURT:1d8
-F:DROP_60 | WILD_TOO |
+F:DROP_60 | WILD_ALL |
 F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE
 F:EVIL | IM_POIS | EAT_POISONOUS
 D:$It is a small, dog-headed humanoid.
@@ -677,7 +677,7 @@ G:R:U
 I:110:3d4:20:4:15
 W:1:1:0:4:20:82
 B:BITE:HURT:1d3
-F:ANIMAL | CAN_SWIM | WILD_TOO | WILD_MOUNTAIN
+F:ANIMAL | CAN_SWIM | WILD_MOUNTAIN
 F:DROP_CORPSE
 D:$It is a small lizard with a hardened hide.
 D:¤½¤ì¤Ï¾®¤µ¤Ê¥È¥«¥²¤Ç¸Ç¤¤Èé¤ò»ý¤Ã¤Æ¤¤¤ë¡£
@@ -703,7 +703,7 @@ I:110:1d4:10:3:10
 W:1:1:0:3:40:196
 B:BITE:HURT:1d3
 F:FRIENDS | 
-F:ANIMAL | WILD_TOO | WILD_WOOD | WILD_GRASS | DROP_SKELETON | DROP_CORPSE
+F:ANIMAL | WILD_WOOD | WILD_GRASS | DROP_SKELETON | DROP_CORPSE
 D:$It is a yapping snarling dog, dangerous when in a pack.
 D:¤½¤ì¤Ï¤ä¤«¤Þ¤·¤¯¤¦¤Ê¤ë¸¤·¿¤Îưʪ¤Ç¡¢·²¤ì¤Æ¤¤¤ë¤È´í¸±¤À¡£
 
@@ -715,7 +715,7 @@ I:110:2d5:10:3:10
 W:1:1:0:6:5:49
 B:BITE:HURT:1d5
 F:WEIRD_MIND | BASH_DOOR | DROP_CORPSE |
-F:ANIMAL | WILD_TOO | WILD_GRASS | EAT_POISONOUS
+F:ANIMAL | WILD_GRASS | EAT_POISONOUS
 D:$A large ant with powerful mandibles.
 D:¶¯¤¤¥¢¥´¤ò»ý¤Ã¤¿Â礭¤Ê¥¢¥ê¤À¡£
 
@@ -726,7 +726,7 @@ G:b:v
 I:120:1d6:20:3:10
 W:1:1:0:3:20:114
 B:BITE:HURT:1d3
-F:ANIMAL | CAN_FLY | WILD_TOO | WILD_WOOD | WILD_SWAMP | DROP_CORPSE
+F:ANIMAL | CAN_FLY | WILD_WOOD | WILD_SWAMP | DROP_CORPSE
 D:$A fast-moving pest.
 D:Æ°¤­¤ÎÁÇÁᤤÌñ²ð¼Ô¤À¡£
 
@@ -739,7 +739,7 @@ I:120:2d2:20:4:10
 W:1:1:0:3:0:0
 B:BITE:HURT:1d5
 B:STING:HURT:1d5
-F:ANIMAL | WEIRD_MIND | CAN_FLY | RAND_25 | WILD_TOO | WILD_GRASS |
+F:ANIMAL | WEIRD_MIND | CAN_FLY | RAND_25 | WILD_GRASS |
 F:WILD_WOOD | WILD_SWAMP
 D:$A lone insect may be harmless, but there's a whole swarm of 
 D:$them here!
@@ -771,7 +771,7 @@ I:110:1d1:4:1:0
 W:2:1:0:3:0:0
 F:FORCE_SLEEP | NEVER_MOVE | NEVER_BLOW | 
 F:STUPID | EMPTY_MIND | 
-F:IM_POIS | WILD_TOO | WILD_SWAMP | DROP_CORPSE |
+F:IM_POIS | WILD_SWAMP | DROP_CORPSE |
 F:NO_CONF | NO_SLEEP | NO_FEAR
 S:1_IN_4 | 
 S:SHRIEK
@@ -805,7 +805,7 @@ G:c:G
 I:120:4d4:5:4:10
 W:2:1:0:4:6:67
 B:CRAWL:HURT:1d3
-F:RAND_50 | WILD_TOO | DROP_SKELETON
+F:RAND_50 | WILD_ALL | DROP_SKELETON
 F:WEIRD_MIND | BASH_DOOR | 
 F:ANIMAL
 D:$It is about four feet long and carnivorous.
@@ -821,7 +821,7 @@ B:HIT:HURT:1d8
 B:HIT:HURT:1d8
 B:HIT:HURT:1d7
 F:MALE | HAS_LITE_1 |
-F:DROP_60 | WILD_TOO | DROP_SKELETON | DROP_CORPSE
+F:DROP_60 | WILD_ALL | DROP_SKELETON | DROP_CORPSE
 F:OPEN_DOOR | BASH_DOOR | EAT_GIVE_STR | EAT_LOSE_INT | EAT_LOSE_WIS
 D:$He looks inexperienced but tough.
 D:Èà¤Ï¤Þ¤À¤Þ¤À·Ð¸³¤ÏÀõ¤¤¤è¤¦¤À¤¬¡¢¼ê¶¯¤¤Áê¼ê¤À¡£
@@ -837,7 +837,7 @@ B:HIT:HURT:1d5
 B:TOUCH:EAT_GOLD
 F:MALE |
 F:DROP_60 | DROP_SKELETON | DROP_CORPSE
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | WILD_TOO |
+F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | WILD_ALL |
 F:EVIL | EAT_GIVE_DEX | EAT_LOSE_WIS | EAT_LOSE_CHR
 D:$A rather shifty individual.
 D:Èà¤Ï¿¾¯¤Ïºöά¤ò¤á¤°¤é¤¹¡£
@@ -850,7 +850,7 @@ I:110:7d4:20:10:10
 W:2:1:0:9:100:225
 B:HIT:HURT:1d9
 F:MALE | HAS_LITE_1 |
-F:FORCE_SLEEP | GOOD | WILD_TOO | DROP_SKELETON | DROP_CORPSE
+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
 S:1_IN_12 | 
@@ -866,7 +866,7 @@ I:110:6d4:20:6:5
 W:2:1:0:9:100:240
 B:HIT:HURT:1d8
 F:MALE | HAS_LITE_1 |
-F:FORCE_SLEEP | WILD_TOO | DROP_SKELETON | DROP_CORPSE
+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
 S:1_IN_12 | 
@@ -881,7 +881,7 @@ G:,:y
 I:110:1d1:2:1:0
 W:2:1:0:3:10:72
 B:SPORE:TERRIFY:2d5
-F:NEVER_MOVE | WILD_TOO | WILD_SWAMP |
+F:NEVER_MOVE | WILD_SWAMP |
 F:STUPID | EMPTY_MIND | 
 F:IM_POIS | 
 F:NO_CONF | NO_SLEEP | NO_FEAR
@@ -911,7 +911,7 @@ W:2:1:0:10:40:168
 B:BITE:HURT:1d8
 F:RAND_25 | 
 F:WEIRD_MIND | DROP_CORPSE | EAT_ACIDIC
-F:BASH_DOOR | WILD_TOO | WILD_WOOD | WILD_GRASS |
+F:BASH_DOOR | WILD_WOOD | WILD_GRASS |
 F:ANIMAL
 D:$It is about three feet long.
 D:¤½¤ì¤ÏÂ礭¤µ¤¬ 1 ¥á¡¼¥È¥ë¶á¤¯¤â¤¢¤ë¡£
@@ -923,7 +923,7 @@ G:R:o
 I:110:4d6:8:20:80
 W:2:1:0:12:50:143
 B:BITE:FIRE:1d7
-F:RAND_25 | CAN_SWIM | WILD_TOO | WILD_VOLCANO | DROP_CORPSE
+F:RAND_25 | CAN_SWIM | WILD_VOLCANO | DROP_CORPSE
 F:ANIMAL | IM_FIRE | EAT_FIRE_RES
 D:$A small black and orange lizard.
 D:¹õ¤È¥ª¥ì¥ó¥¸¿§¤Î¤Þ¤À¤éÌÏÍͤò¤·¤¿¾®¤µ¤Ê¥È¥«¥²¤À¡£
@@ -937,7 +937,7 @@ W:2:1:0:7:30:157
 B:CLAW:HURT:1d2
 B:CLAW:HURT:1d2
 B:BITE:HURT:1d3
-F:FEMALE | CAN_FLY | WILD_TOO | WILD_MOUNTAIN 
+F:FEMALE | CAN_FLY | WILD_MOUNTAIN 
 F:RAND_50 | DROP_CORPSE
 F:ANIMAL | EVIL
 D:$A flying, screeching bird with a woman's face.
@@ -1055,7 +1055,7 @@ I:100:4d8:5:38:75
 W:2:1:0:11:15:90
 B:BITE:HURT:1d7
 B:CRUSH:HURT:2d5
-F:RAND_25 | CAN_SWIM | WILD_TOO | DROP_SKELETON | DROP_CORPSE
+F:RAND_25 | CAN_SWIM | WILD_ALL | DROP_SKELETON | DROP_CORPSE
 F:BASH_DOOR | 
 F:ANIMAL
 D:$It is about ten feet long.
@@ -1099,7 +1099,7 @@ I:120:3d5:40:12:0
 W:2:2:0:10:80:198
 B:CLAW:HURT:1d6
 B:CLAW:HURT:1d6
-F:BASH_DOOR | WILD_TOO | DROP_SKELETON | DROP_CORPSE
+F:BASH_DOOR | WILD_ALL | DROP_SKELETON | DROP_CORPSE
 F:ANIMAL
 D:$A larger than normal feline, hissing loudly.  Its velvet claws conceal a 
 D:$fistful of needles.
@@ -1115,7 +1115,7 @@ W:3:2:0:18:0:0
 B:TOUCH:EAT_GOLD
 F:UNIQUE | MALE | CAN_SWIM | DROP_SKELETON | DROP_CORPSE
 F:FORCE_MAXHP | CAN_SPEAK | SMART | 
-F:RAND_50 | RAND_25 | WILD_TOO | EAT_LOSE_STR | EAT_LOSE_INT |
+F:RAND_50 | RAND_25 | WILD_ALL | EAT_LOSE_STR | EAT_LOSE_INT |
 F:ONLY_ITEM | DROP_90 | DROP_GOOD | DROP_GREAT |
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | INVISIBLE
 F:EVIL
@@ -1195,7 +1195,7 @@ I:120:4d5:6:6:15
 W:3:1:0:8:15:77
 B:CRAWL:HURT:1d4
 F:RAND_50 | DROP_SKELETON
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO |
+F:WEIRD_MIND | BASH_DOOR | WILD_ALL |
 F:ANIMAL
 D:$It is about four feet long and carnivorous.
 D:¤½¤ì¤ÏŤµ¤¬ 1.5 ¥á¡¼¥È¥ë¶á¤¯¤â¤¢¤ëÆù¿©À¸Êª¤À¡£
@@ -1234,7 +1234,7 @@ G:l:B
 I:120:2d6:20:8:5
 W:3:1:0:9:40:187
 B:BITE:HURT:13d1
-F:FRIENDS | AQUATIC | ANIMAL | WILD_TOO
+F:FRIENDS | AQUATIC | ANIMAL | WILD_ALL
 D:$Bloodthirsty fish who can smell your blood from a great distance.
 D:¤³¤Î·ì¤Ëµ²¤¨¤¿µû¤Ï¤¢¤Ê¤¿¤Î·ì¤ÎÆ÷¤¤¤ò±ó¤¯¤«¤é¤«¤®Ê¬¤±¤ë¡£
 
@@ -1259,7 +1259,7 @@ G:,:o
 I:110:1d1:2:1:0
 W:3:1:0:4:20:108
 B:SPORE:POISON:2d8
-F:NEVER_MOVE | WILD_TOO | WILD_SWAMP |
+F:NEVER_MOVE | WILD_SWAMP |
 F:STUPID | EMPTY_MIND | 
 F:IM_POIS | 
 F:NO_CONF | NO_SLEEP | NO_FEAR
@@ -1308,7 +1308,7 @@ G:a:w
 I:110:3d6:8:16:80
 W:3:1:0:9:40:168
 B:BITE:HURT:1d7
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | WILD_GRASS
+F:WEIRD_MIND | BASH_DOOR | WILD_GRASS
 F:ANIMAL | DROP_CORPSE
 D:$It is about two feet long and has sharp pincers.
 D:¤½¤ì¤ÏÂ礭¤µ¤¬ 60 ¥»¥ó¥Á¶á¤¯¤¢¤ê¡¢¤µ¤é¤Ë±Ô¤¤¥¢¥´¤â»ý¤Ã¤Æ¤¤¤ë¡£
@@ -1335,7 +1335,7 @@ I:120:4d8:8:9:20
 W:3:1:0:14:150:276
 B:CRAWL:HURT:1d4
 F:RAND_25 | 
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | DROP_SKELETON
+F:WEIRD_MIND | BASH_DOOR | WILD_ALL | DROP_SKELETON
 F:ANIMAL
 D:$It is about four feet long and carnivorous.
 D:¤½¤ì¤ÏŤµ¤¬ 1.5 ¥á¡¼¥È¥ë¶á¤¯¤â¤¢¤ëÆù¿©À¸Êª¤À¡£
@@ -1416,7 +1416,7 @@ B:HIT:HURT:1d7
 F:MALE | HAS_LITE_1 |
 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_TOO | WILD_WOOD |
+F:OPEN_DOOR | BASH_DOOR | WILD_WOOD |
 S:1_IN_9 | 
 S:ARROW_2 | MISSILE
 D:$An agile hunter, ready and relaxed.
@@ -1474,7 +1474,7 @@ W:4:1:0:15:30:118
 B:HIT:HURT:1d9
 F:MALE | 
 F:FRIENDS | DROP_60 | RAND_50 | DROP_SKELETON | DROP_CORPSE
-F:OPEN_DOOR | BASH_DOOR | WILD_TOO | WILD_WOOD | EAT_POISONOUS
+F:OPEN_DOOR | BASH_DOOR | WILD_WOOD | EAT_POISONOUS
 F:EVIL | ORC | HURT_LITE | EAT_GIVE_DEX | EAT_LOSE_STR | EAT_LOSE_CHR
 D:$A pathetic breed of tiny snaga-like creatures. They are running 
 D:$wild and screaming all the time!
@@ -1490,7 +1490,7 @@ I:120:5d12:14:10:20
 W:4:2:0:15:0:0
 B:STING:HURT:7d1
 B:STING:HURT:7d1
-F:ANIMAL | AQUATIC | WILD_TOO |
+F:ANIMAL | AQUATIC | WILD_ALL |
 D:$An animal with a swordlike "beak".
 D:¤½¤ì¤Ï·õ¤Î¤è¤¦¤Ê"îìÉ¡"¤ò»ý¤Ã¤¿µû¤À¡£
 
@@ -1517,7 +1517,7 @@ W:4:1:0:14:25:106
 B:BITE:HURT:1d8
 B:CRUSH:HURT:1d10
 F:RAND_25 | CAN_SWIM | DROP_SKELETON | DROP_CORPSE
-F:BASH_DOOR | WILD_TOO |
+F:BASH_DOOR | WILD_ALL |
 F:ANIMAL
 D:$It is about ten feet long.
 D:¤½¤ì¤ÏŤµ¤¬ 3 ¥á¡¼¥È¥ë¶á¤¯¤â¤¢¤ë¡£
@@ -1545,7 +1545,7 @@ W:5:2:0:20:0:0
 B:HIT:HURT:2d4
 B:HIT:HURT:2d4
 F:DROP_60 | OPEN_DOOR | BASH_DOOR | FRIENDS | DROP_CORPSE |
-F:WILD_TOO | WILD_WOOD | HAS_LITE_1 |
+F:WILD_WOOD | HAS_LITE_1 |
 S:1_IN_8
 S:ARROW_1
 D:$A cute, furry little animal, full of merchandising potential. 
@@ -1560,7 +1560,7 @@ W:5:2:0:7:100:240
 B:HIT:HURT:1d8
 F:MALE | HAS_LITE_2 |
 F:FORCE_SLEEP | 
-F:FRIENDS | DROP_60 | WILD_TOO | DROP_SKELETON | DROP_CORPSE
+F:FRIENDS | DROP_60 | WILD_ALL | DROP_SKELETON | DROP_CORPSE
 F:OPEN_DOOR | BASH_DOOR |
 S:1_IN_12 | 
 S:BLINK | BLIND | CONF | MISSILE
@@ -1577,7 +1577,7 @@ B:CRUSH:HURT:2d6
 B:SPIT:ACID:2d8
 F:FEMALE | 
 F:RAND_25 | TAKE_ITEM | DROP_60 | DROP_CORPSE
-F:BASH_DOOR | CAN_SWIM | WILD_TOO | WILD_SHORE |
+F:BASH_DOOR | CAN_SWIM | WILD_SHORE |
 F:EVIL | IM_ACID | EAT_ACIDIC
 D:$A large green serpent with a female's torso.  Her green skin glistens with 
 D:$acid.
@@ -1605,7 +1605,7 @@ I:120:6d12:20:45:20
 W:5:2:0:30:0:0
 B:BITE:HURT:13d1
 B:BITE:HURT:2d7
-F:AQUATIC | ANIMAL | WILD_TOO |
+F:AQUATIC | ANIMAL | WILD_ALL |
 D:$A predatory fish with razor-sharp teeth.
 D:¤½¤ì¤Ï¤­¤ï¤É¤¯±Ô¤¤»õ¤ò»ý¤Ã¤¿Æù¿©¤Îµû¤À¡£
 
@@ -1619,7 +1619,7 @@ B:HIT:HURT:2d4
 B:HIT:HURT:2d4
 F:MALE | HAS_LITE_1 |
 F:FORCE_SLEEP | 
-F:DROP_60 | WILD_TOO | DROP_SKELETON | DROP_CORPSE |
+F:DROP_60 | WILD_ALL | DROP_SKELETON | DROP_CORPSE |
 F:OPEN_DOOR | BASH_DOOR | EAT_GIVE_WIS | EAT_LOSE_INT
 S:1_IN_9 | 
 S:SCARE | CAUSE_1
@@ -1745,7 +1745,7 @@ G:J:o
 I:110:4d6:6:20:1
 W:5:1:0:15:30:119
 B:BITE:POISON:2d6
-F:RAND_50 | CAN_SWIM | WILD_TOO | DROP_SKELETON | DROP_CORPSE
+F:RAND_50 | CAN_SWIM | WILD_ALL | DROP_SKELETON | DROP_CORPSE
 F:BASH_DOOR | EAT_POISONOUS
 F:ANIMAL | IM_POIS
 D:$It has a copper head and sharp venomous fangs.
@@ -1790,7 +1790,7 @@ I:110:7d4:20:10:5
 W:6:2:0:7:100:225
 B:HIT:HURT:1d9
 F:MALE | GOOD | HAS_LITE_2 |
-F:FORCE_SLEEP | WILD_TOO | DROP_SKELETON | DROP_CORPSE |
+F:FORCE_SLEEP | WILD_ALL | DROP_SKELETON | DROP_CORPSE |
 F:FRIENDS | DROP_60 |
 F:OPEN_DOOR | BASH_DOOR
 S:1_IN_12 | 
@@ -1808,7 +1808,7 @@ B:HIT:HURT:1d8
 B:HIT:HURT:1d8
 B:HIT:HURT:1d7
 F:MALE | HAS_LITE_2 |
-F:FRIENDS | DROP_60 | WILD_TOO |
+F:FRIENDS | DROP_60 | WILD_ALL |
 F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE
 D:$He looks inexperienced but tough.
 D:Èà¤Ï¤Þ¤À¤Þ¤À·Ð¸³¤ÏÀõ¤¤¤è¤¦¤À¤¬¡¢¥Á¡¼¥à¥ï¡¼¥¯¤ò¿´ÆÀ¤¿¼ê¶¯¤¤Áê¼ê¤À¡£
@@ -1862,7 +1862,7 @@ G:b:u
 I:130:3d8:10:15:30
 W:6:1:0:10:0:0
 B:BITE:HURT:1d4
-F:RAND_50 | CAN_FLY | WILD_TOO | WILD_MOUNTAIN | WILD_WOOD |
+F:RAND_50 | CAN_FLY | WILD_MOUNTAIN | WILD_WOOD |
 F:ANIMAL | DROP_CORPSE
 D:$It screeches as it attacks.
 D:¤½¤ì¤Ï¹¶·â¤ò¤¹¤ë¤È¤­¤Ë¥­¡¼¥­¡¼¤ÈÌĤ¯¡£
@@ -1899,7 +1899,7 @@ W:6:2:0:20:140:219
 B:HIT:HURT:1d5
 B:HIT:HURT:1d5
 F:MALE | HAS_LITE_1 |
-F:FORCE_SLEEP | WILD_TOO | DROP_SKELETON | DROP_CORPSE
+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
 S:1_IN_3 | 
@@ -1929,7 +1929,7 @@ I:110:8d8:20:32:30
 W:6:1:0:15:0:0
 B:HIT:HURT:1d9
 F:MALE | 
-F:FRIENDS | DROP_60 | WILD_TOO | DROP_SKELETON | DROP_CORPSE
+F:FRIENDS | DROP_60 | WILD_ALL | DROP_SKELETON | DROP_CORPSE
 F:OPEN_DOOR | BASH_DOOR | 
 F:EVIL | ORC | HURT_LITE
 D:$He is one of the many weaker 'slave' orcs, often mistakenly known as a 
@@ -1944,7 +1944,7 @@ G:J:r
 I:110:6d7:6:24:1
 W:6:1:0:20:80:171
 B:BITE:POISON:2d6
-F:RAND_50 | CAN_SWIM | WILD_TOO | DROP_SKELETON | DROP_CORPSE
+F:RAND_50 | CAN_SWIM | WILD_ALL | DROP_SKELETON | DROP_CORPSE
 F:BASH_DOOR | EAT_POISONOUS |
 F:ANIMAL | IM_POIS
 D:$It is recognized by the hard-scaled end of its body that is often rattled 
@@ -1959,7 +1959,7 @@ I:100:12d9:10:25:25
 W:6:1:0:25:800:404
 B:BITE:ACID:2d5
 B:BITE:ACID:2d7
-F:ANIMAL | EMPTY_MIND | KILL_ITEM | KILL_BODY | CAN_SWIM | WILD_TOO |
+F:ANIMAL | EMPTY_MIND | KILL_ITEM | KILL_BODY | CAN_SWIM | WILD_ALL |
 F:DROP_CORPSE | EAT_ACIDIC
 S:1_IN_10
 S:BR_ACID
@@ -2070,7 +2070,7 @@ W:7:3:0:15:100:277
 B:BITE:HURT:1d4
 B:STING:POISON:1d5
 F:FRIENDS | DROP_SKELETON
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | WILD_WOOD
+F:WEIRD_MIND | BASH_DOOR | WILD_WOOD
 F:ANIMAL | IM_POIS
 D:$It scuttles towards you.
 D:¤½¤ì¤Ï°ìÌÜ»¶¤ËËÁ¸±¼Ô¤Ë¸þ¤«¤Ã¤Æ¤¯¤ë¡£
@@ -2110,7 +2110,7 @@ I:110:11d8:20:40:120
 W:7:2:0:40:200:265
 B:CRUSH:HURT:2d6
 B:BITE:LOSE_STR:1d5
-F:FEMALE | CAN_SWIM | WILD_TOO | WILD_SHORE |
+F:FEMALE | CAN_SWIM | WILD_SHORE |
 F:RAND_25 | DROP_60 | 
 F:TAKE_ITEM | BASH_DOOR | DROP_CORPSE | EAT_LOSE_STR |
 F:EVIL
@@ -2170,7 +2170,7 @@ I:110:4d8:20:16:30
 W:7:2:0:35:200:249
 B:BITE:HURT:1d8
 B:BITE:HURT:1d8
-F:ANIMAL | CAN_SWIM | WILD_TOO | DROP_CORPSE
+F:ANIMAL | CAN_SWIM | WILD_ALL | DROP_CORPSE
 D:$It is a black lizard with overlapping scales and a powerful jaw.
 D:¤½¤ì¤Ï¸Ç¤¤Èé¤È¶¯ÎϤʥ¢¥´¤ò»ý¤Ã¤¿¹õ¤¤¥È¥«¥²¤À¡£
 
@@ -2254,7 +2254,7 @@ B:HIT:HURT:1d6
 B:TOUCH:EAT_GOLD
 B:TOUCH:EAT_ITEM
 F:UNIQUE | MALE | FORCE_SLEEP | FORCE_MAXHP | CAN_SPEAK |
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | DROP_GREAT | WILD_TOO | WILD_WOOD |
+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
 S:1_IN_5
@@ -2374,7 +2374,7 @@ W:8:2:0:30:100:188
 B:CLAW:HURT:2d5
 B:CLAW:HURT:2d5
 B:BITE:HURT:7d1
-F:ANIMAL | CAN_FLY | WILD_TOO | WILD_WOOD | WILD_MOUNTAIN
+F:ANIMAL | CAN_FLY | WILD_WOOD | WILD_MOUNTAIN
 F:DROP_CORPSE
 D:$It looks fantastic, yet frightening.
 D:¤½¤ì¤Ï´ñ¤Ã²ø¤Ç¡¢¤·¤«¤â¶²¤í¤·¤¯¸«¤¨¤ë¡£
@@ -2401,7 +2401,7 @@ I:110:6d8:20:16:5
 W:8:2:0:20:500:1038
 B:HIT:HURT:2d4
 B:HIT:HURT:2d4
-F:MALE | GOOD | WILD_TOO | DROP_SKELETON | DROP_CORPSE
+F:MALE | GOOD | WILD_ALL | DROP_SKELETON | DROP_CORPSE
 F:FORCE_SLEEP | HAS_LITE_2 |
 F:FRIENDS | DROP_60 | 
 F:OPEN_DOOR | BASH_DOOR
@@ -2446,7 +2446,7 @@ W:8:2:0:26:100:199
 B:HIT:HURT:2d6
 B:TOUCH:EAT_GOLD
 F:MALE |
-F:DROP_1D2 | WILD_TOO |
+F:DROP_1D2 | WILD_ALL |
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE
 F:EVIL
 D:$He is after your cash!
@@ -2502,7 +2502,7 @@ W:9:3:0:30:100:983
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:BITE:HURT:1d5
-F:OPEN_DOOR | BASH_DOOR | WILD_TOO | WILD_MOUNTAIN | DROP_CORPSE
+F:OPEN_DOOR | BASH_DOOR | WILD_MOUNTAIN | DROP_CORPSE
 F:ANIMAL | IM_COLD
 D:$A large white figure covered in shaggy fur.
 D:¤±¤à¤¯¤¸¤ã¤é¤ÎÂ礭¤ÊÇò¤¤¥â¥ó¥¹¥¿¡¼¤À¡£
@@ -2545,7 +2545,7 @@ W:9:1:0:19:0:0
 B:CLAW:HURT:1d3
 B:CLAW:HURT:1d3
 B:BITE:HURT:1d3
-F:FEMALE | CAN_FLY | WILD_TOO | WILD_MOUNTAIN | DROP_CORPSE
+F:FEMALE | CAN_FLY | WILD_MOUNTAIN | DROP_CORPSE
 F:RAND_25 | 
 F:ANIMAL | EVIL
 D:$A woman's face on the body of a vicious black bird.
@@ -2560,7 +2560,7 @@ W:9:1:0:20:0:0
 B:HIT:HURT:1d5
 B:HIT:HURT:1d5
 F:EVIL | FRIENDS | DROP_60 | DROP_90 | DROP_SKELETON | DROP_CORPSE
-F:OPEN_DOOR | MALE | WILD_TOO | WILD_WASTE | WILD_SWAMP
+F:OPEN_DOOR | MALE | WILD_WASTE | WILD_SWAMP
 D:$A mutated rat-creature from the great waste, it is vaguely 
 D:$humanoid in appearance and walks on its hind legs. This race
 D:$serves chaos fervently and is greatly feared by others.
@@ -2590,7 +2590,7 @@ I:110:10d10:20:30:75
 W:9:2:0:25:0:0
 B:TOUCH:PARALYZE:1d7
 B:TOUCH:PARALYZE:1d7
-F:ANIMAL | AQUATIC | IM_POIS | WILD_TOO |
+F:ANIMAL | AQUATIC | IM_POIS | WILD_ALL |
 D:$A strange water creature, whose touch can be deadly.
 D:´ñ̯¤Ê¿åÀ³À¸Êª¤Ç¡¢¤½¤Î¿¨¼ê¤ÏÃ×̿Ū¤ÊÆǤò»ý¤Ä¡£
 
@@ -2618,7 +2618,7 @@ W:9:1:0:30:0:0
 B:HIT:HURT:1d7
 B:HIT:HURT:1d7
 F:MALE | 
-F:FORCE_SLEEP | DROP_90 | WILD_TOO | WILD_WOOD | WILD_SWAMP | WILD_MOUNTAIN |
+F:FORCE_SLEEP | DROP_90 | WILD_WOOD | WILD_SWAMP | WILD_MOUNTAIN |
 F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE
 F:EVIL | ORC | HURT_LITE | EAT_GIVE_INT | EAT_LOSE_WIS | EAT_SLEEP |
 S:1_IN_8 | 
@@ -2734,7 +2734,7 @@ I:110:4d8:12:34:60
 W:9:2:0:22:500:408
 B:BITE:HURT:1d5
 B:STING:LOSE_STR:1d4
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | DROP_CORPSE
+F:WEIRD_MIND | BASH_DOOR | WILD_ALL | DROP_CORPSE
 F:ANIMAL
 D:$It is large and has venomous mandibles.
 D:¤½¤ì¤ÏÂ礭¤¯¤Æ¶¯ÎϤʥ¢¥´¤ò»ý¤Ã¤Æ¤¤¤ë¡£
@@ -2750,7 +2750,7 @@ B:HIT:HURT:1d13
 B:HIT:HURT:1d13
 B:HIT:HURT:1d13
 F:UNIQUE | MALE | EVIL | HAS_LITE_2 |
-F:FORCE_MAXHP | CAN_SPEAK | WILD_TOO | DROP_SKELETON | DROP_CORPSE
+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
 D:$A nasty piece of work, Brodda picks on defenseless women and children.
@@ -2787,7 +2787,7 @@ I:110:8d10:8:30:1
 W:9:2:0:28:80:210
 B:SPIT:BLIND:1d5
 B:BITE:POISON:3d4
-F:RAND_50 | WILD_TOO | WILD_SWAMP | WILD_WOOD | DROP_SKELETON | DROP_CORPSE
+F:RAND_50 | WILD_SWAMP | WILD_WOOD | DROP_SKELETON | DROP_CORPSE
 F:BASH_DOOR | CAN_SWIM | EAT_BLIND | EAT_POISONOUS
 F:ANIMAL | IM_POIS
 D:$It is a large snake with a hooded face.
@@ -2832,7 +2832,7 @@ I:120:2d4:12:34:10
 W:9:2:0:22:0:0
 B:STING:POISON:1d5
 B:STING:LOSE_STR:1d4
-F:WEIRD_MIND | FRIENDS | CAN_FLY | WILD_TOO |
+F:WEIRD_MIND | FRIENDS | CAN_FLY | WILD_ALL |
 F:ANIMAL
 D:$It is poisonous and aggressive.
 D:¤½¤ì¤ÏÆǤò»ý¤Ã¤Æ¤¤¤ë¾å¤Ë¹¶·âŪ¤À¡£
@@ -2847,7 +2847,7 @@ B:BITE:HURT:1d10
 B:BITE:POISON:1d7
 B:BITE:POISON:1d7
 B:BITE:HURT:1d10
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | DROP_SKELETON
+F:WEIRD_MIND | BASH_DOOR | WILD_ALL | DROP_SKELETON
 F:ANIMAL | IM_POIS
 D:$It is a vast black spider whose bulbous body is bloated with poison.
 D:¤½¤ì¤ÏµðÂç¤Ê¹õ¤¤ÃØéá¤Ç¡¢¤½¤ÎËĤ줿ʢ¤Ë¤ÏÆǤ¬½¼Ëþ¤·¤Æ¤¤¤ë¡£
@@ -3009,7 +3009,7 @@ I:110:9d10:20:20:20
 W:10:1:0:30:0:0
 B:CLAW:HURT:1d6
 B:CLAW:HURT:1d6
-F:FRIENDS | WILD_TOO | WILD_WASTE | DROP_SKELETON
+F:FRIENDS | WILD_WASTE | DROP_SKELETON
 F:OPEN_DOOR | BASH_DOOR | HURT_LITE | EVIL | DROP_60 | DROP_90
 F:MALE
 D:$"Rough-skinned, large-eyed, large-eared, with a horrible, 
@@ -3066,7 +3066,7 @@ B:HIT:HURT:1d12
 B:HIT:HURT:1d10
 B:HIT:HURT:1d12
 B:HIT:HURT:1d10
-F:UNIQUE | MALE | CAN_SPEAK | FORCE_MAXHP | ESCORT | WILD_TOO |
+F:UNIQUE | MALE | CAN_SPEAK | FORCE_MAXHP | ESCORT | WILD_ALL |
 F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | DROP_SKELETON | DROP_CORPSE |
 F:OPEN_DOOR | BASH_DOOR | EVIL | ORC | IM_POIS | EAT_NEXUS
 D:$He is a cunning and devious orc. 
@@ -3085,7 +3085,7 @@ I:120:6d9:30:30:10
 W:10:2:0:40:0:0
 B:BITE:HURT:9d1
 B:BITE:HURT:9d1
-F:NO_SLEEP | WILD_TOO | 
+F:NO_SLEEP | WILD_ALL | 
 F:FRIENDS | AQUATIC | ANIMAL
 D:$A very large and bloodthirsty fish.
 D:Èó¾ï¤ËÂç·¿¤Ç·ì¤Ëµ²¤¨¤¿µû¤À¡£
@@ -3217,7 +3217,7 @@ W:10:1:0:30:100:211
 B:BITE:HURT:1d7
 F:RAND_25 | 
 F:FRIENDS | 
-F:BASH_DOOR | WILD_TOO | WILD_WOOD | WILD_WASTE | WILD_MOUNTAIN 
+F:BASH_DOOR | WILD_WOOD | WILD_WASTE | WILD_MOUNTAIN 
 F:ANIMAL | DROP_CORPSE
 D:$It howls and snaps at you.
 D:¤½¤ì¤ÏËÁ¸±¼Ô¤ËËʤ¨¤¿¤Æ¤Æ¤Ï¡¢Èô¤Ó¤«¤«¤Ã¤Æ¤¯¤ë¡£
@@ -3243,7 +3243,7 @@ I:120:10d8:40:30:0
 W:10:2:0:25:150:230
 B:CLAW:HURT:1d8
 B:CLAW:HURT:1d8
-F:BASH_DOOR | WILD_TOO | WILD_WOOD | WILD_GRASS | DROP_SKELETON | DROP_CORPSE
+F:BASH_DOOR | WILD_WOOD | WILD_GRASS | DROP_SKELETON | DROP_CORPSE
 F:ANIMAL | EAT_SPEED | EAT_GIVE_DEX
 D:$A large black cat, stalking you with intent.  It thinks you're its next 
 D:$meal.
@@ -3376,7 +3376,7 @@ I:120:10d10:40:40:0
 W:11:3:0:40:0:0
 B:BITE:HURT:6d1
 B:BITE:HURT:7d1
-F:BASH_DOOR | WILD_TOO | WILD_MOUNTAIN | DROP_CORPSE
+F:BASH_DOOR | WILD_MOUNTAIN | DROP_CORPSE
 F:ANIMAL
 S:1_IN_8
 S:BLINK
@@ -3423,7 +3423,7 @@ I:110:20d9:12:14:10
 W:11:1:0:30:0:0
 B:BITE:HURT:2d5
 B:BITE:HURT:2d5
-F:AQUATIC | WILD_TOO | DROP_CORPSE
+F:AQUATIC | WILD_ALL | DROP_CORPSE
 F:ANIMAL
 D:$A truly strange hybrid of a horse and a fish.
 D:ËÜÅö¤Ë´ñ̯¤ÊÇϤȵû¤Î³Ý¤±¹ç¤ï¤»¤À¡£
@@ -3452,7 +3452,7 @@ I:110:20d9:12:14:10
 W:11:1:0:30:200:279
 B:HIT:HURT:2d6
 B:BITE:HURT:2d6
-F:BASH_DOOR | CAN_FLY | WILD_TOO | WILD_MOUNTAIN | WILD_GRASS |
+F:BASH_DOOR | CAN_FLY | WILD_MOUNTAIN | WILD_GRASS |
 F:ANIMAL | DROP_CORPSE | RIDING
 D:$A strange hybrid of eagle, lion and horse.  It looks weird.
 D:¥ï¥·¤È¥é¥¤¥ª¥ó¤ÈÇϤκ®·ì¤·¤¿´ñ̯¤ÊÀ¸Êª¤À¡£¤½¤ì¤ÏĶ¼«Á³Åª¤ÊÊ·°Ïµ¤¤ò
@@ -3466,7 +3466,7 @@ I:120:10d8:10:32:1
 W:12:3:0:40:0:0
 B:BITE:POISON:4d4
 F:RAND_50 | 
-F:BASH_DOOR | CAN_SWIM | WILD_TOO | WILD_WOOD | WILD_GRASS | WILD_SWAMP
+F:BASH_DOOR | CAN_SWIM | WILD_WOOD | WILD_GRASS | WILD_SWAMP
 F:ANIMAL | IM_POIS | DROP_SKELETON | DROP_CORPSE | EAT_POISONOUS
 D:$It has glistening black skin, a sleek body and highly venomous fangs.
 D:¤½¤ì¤Ï¥­¥é¥­¥é¤È¸÷¤ë¹õ¤¤ÈéÉæ¡¢¤Ä¤ä¤Ä¤ä¤·¤¿ÂΡ¢Ä¹¤¯µðÂç¤Ê²ç¤ò»ý¤Ã¤Æ¤¤¤ë¡£
@@ -3481,7 +3481,7 @@ B:BITE:HURT:1d4
 B:BITE:HURT:1d4
 F:RAND_25 | 
 F:FRIENDS | 
-F:BASH_DOOR | WILD_TOO | WILD_WASTE |
+F:BASH_DOOR | WILD_WASTE |
 F:ANIMAL | IM_COLD | DROP_SKELETON | DROP_CORPSE
 D:$A large and muscled wolf from the northern wastes.  Its breath is cold and 
 D:$icy and its fur coated in frost.
@@ -3548,7 +3548,7 @@ B:HIT:HURT:1d12
 B:HIT:HURT:1d10
 B:HIT:HURT:1d10
 F:UNIQUE | MALE | 
-F:FORCE_MAXHP | WILD_TOO |
+F:FORCE_MAXHP | WILD_ALL |
 F:ESCORT | DROP_SKELETON | DROP_CORPSE
 F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | EAT_POISONOUS
 F:OPEN_DOOR | BASH_DOOR | CAN_SPEAK |
@@ -3564,7 +3564,7 @@ I:110:12d8:20:34:20
 W:12:1:0:40:400:372
 B:HIT:HURT:3d6
 B:HIT:HURT:3d6
-F:MALE | WILD_TOO | HAS_LITE_2 |
+F:MALE | WILD_ALL | HAS_LITE_2 |
 F:DROP_1D2 | DROP_SKELETON | DROP_CORPSE
 F:OPEN_DOOR | BASH_DOOR
 D:$A warrior of considerable skill.
@@ -3578,7 +3578,7 @@ I:110:10d8:20:15:20
 W:9:1:0:36:0:0
 B:HIT:HURT:1d7
 B:HIT:HURT:1d7
-F:MALE | WILD_TOO | WILD_SWAMP | WILD_WASTE |
+F:MALE | WILD_SWAMP | WILD_WASTE |
 F:FORCE_SLEEP | DROP_90 | HAS_LITE_2 |
 F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE
 F:EVIL | 
@@ -3598,7 +3598,7 @@ W:12:1:0:40:300:488
 B:GAZE:PARALYZE:1d2
 B:GAZE:CONFUSE:1d2
 B:GAZE:DR_MANA:1d6
-F:CAN_FLY | IM_POIS | WILD_TOO | WILD_WOOD | DROP_CORPSE | EVIL
+F:CAN_FLY | IM_POIS | WILD_WOOD | DROP_CORPSE | EVIL
 F:EAT_MANA | EAT_CONF | EAT_SLEEP
 S:1_IN_8
 S:HOLD | CONF
@@ -3632,7 +3632,7 @@ I:110:12d8:20:30:20
 W:12:1:0:40:600:406
 B:STING:POISON:2d5
 B:STING:POISON:2d5
-F:ANIMAL | EVIL | AQUATIC | IM_POIS | WILD_TOO |
+F:ANIMAL | EVIL | AQUATIC | IM_POIS | WILD_ALL |
 D:$A devil ray of the depths.
 D:¿¼³¤¤ËÀ³¤à°­Ëâ¤Î¥¨¥¤¤À¡£
 
@@ -3804,7 +3804,7 @@ W:12:2:0:40:500:339
 B:CLAW:HURT:1d8
 B:CLAW:HURT:1d8
 B:BITE:HURT:1d6
-F:BASH_DOOR | WILD_TOO | WILD_GRASS | WILD_WOOD | WILD_MOUNTAIN
+F:BASH_DOOR | WILD_GRASS | WILD_WOOD | WILD_MOUNTAIN
 F:ANIMAL | DROP_SKELETON | DROP_CORPSE
 D:$One of the largest of its species, a sleek orange and black shape creeps 
 D:$towards you, ready to pounce.
@@ -3931,7 +3931,7 @@ I:110:13d9:20:33:30
 W:13:2:0:50:300:262
 B:HIT:HURT:2d8
 F:FRIENDS | 
-F:DROP_60 | WILD_TOO | WILD_WOOD | WILD_MOUNTAIN | DROP_CORPSE
+F:DROP_60 | WILD_WOOD | WILD_MOUNTAIN | DROP_CORPSE
 F:OPEN_DOOR | BASH_DOOR | 
 F:EVIL | GIANT
 D:$A hideous, smallish giant that is often found near or with orcs.
@@ -3985,7 +3985,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_TOO | WILD_WOOD | HAS_LITE_2 |
+F:MALE | WILD_WOOD | HAS_LITE_2 |
 F:FORCE_SLEEP | DROP_1D2 | DROP_SKELETON | DROP_CORPSE
 F:SMART | OPEN_DOOR | BASH_DOOR | EAT_SLEEP |
 S:1_IN_3 | 
@@ -4032,7 +4032,7 @@ I:110:12d10:20:36:20
 W:13:2:0:45:0:0
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
-F:MALE | WILD_TOO | DROP_SKELETON | DROP_CORPSE
+F:MALE | WILD_ALL | DROP_SKELETON | DROP_CORPSE
 F:FRIENDS | DROP_60 | EAT_POISONOUS |
 F:OPEN_DOOR | BASH_DOOR | 
 F:EVIL | ORC | HURT_LITE
@@ -4097,7 +4097,7 @@ I:110:16d10:20:45:50
 W:14:1:0:60:0:0
 B:HIT:HURT:6d3
 B:HIT:HURT:6d3
-F:AQUATIC | WILD_TOO |
+F:AQUATIC | WILD_ALL |
 F:MALE
 D:$A race of fair yet belligrent sea elves.
 D:ÀöÎý¤µ¤ì¤¿¡¢¤·¤«¤â¹¥ÀïŪ¤Ê³¤¤Î¥¨¥ë¥Õ¤Î¼ï²¤À¡£
@@ -4125,7 +4125,7 @@ G:F:w
 I:110:5d8:20:20:50
 W:14:3:0:60:0:0
 B:BITE:COLD:1d6
-F:FORCE_SLEEP | WILD_TOO | WILD_WASTE |
+F:FORCE_SLEEP | WILD_WASTE |
 F:RAND_50 | CAN_FLY |
 F:WEIRD_MIND | BASH_DOOR | 
 F:ANIMAL | IM_COLD
@@ -4144,7 +4144,7 @@ W:14:1:0:15:0:0
 B:HIT:HURT:1d8
 B:EXPLODE:HURT:20d2
 F:MALE | 
-F:WILD_TOO | 
+F:WILD_ALL | 
 F:OPEN_DOOR | BASH_DOOR | 
 F:EVIL | ORC | HURT_LITE
 D:$He is one of the many weaker 'slave' orcs, often mistakenly known as a 
@@ -4210,7 +4210,7 @@ I:110:16d10:20:45:50
 W:14:1:0:60:400:321
 B:HIT:HURT:3d6
 B:HIT:HURT:3d6
-F:DROP_60 | WILD_TOO | WILD_MOUNTAIN | DROP_SKELETON | DROP_CORPSE
+F:DROP_60 | WILD_MOUNTAIN | DROP_SKELETON | DROP_CORPSE
 F:OPEN_DOOR | BASH_DOOR | EAT_GIVE_STR
 F:EVIL | GIANT | MALE
 D:$A ten foot tall humanoid with powerful muscles.
@@ -4244,7 +4244,7 @@ I:120:8d8:20:20:40
 W:14:2:0:40:500:347
 B:BITE:HURT:1d10
 F:RAND_25 | 
-F:FRIENDS | WILD_TOO | WILD_WOOD | WILD_MOUNTAIN | DROP_SKELETON | DROP_CORPSE
+F:FRIENDS | WILD_WOOD | WILD_MOUNTAIN | DROP_SKELETON | DROP_CORPSE
 F:BASH_DOOR | 
 F:ANIMAL | EVIL
 D:$It is a large wolf with eyes full of cunning.
@@ -4321,7 +4321,7 @@ I:110:20d9:20:33:30
 W:15:2:0:75:400:907
 B:HIT:HURT:2d8
 B:HIT:HURT:2d8
-F:RAND_25 | WILD_TOO | WILD_MOUNTAIN | DROP_CORPSE
+F:RAND_25 | WILD_MOUNTAIN | DROP_CORPSE
 F:FRIENDS | DROP_60 | 
 F:OPEN_DOOR | BASH_DOOR | 
 F:EVIL | GIANT
@@ -4360,7 +4360,7 @@ I:110:16d10:20:40:20
 W:15:3:0:50:0:0
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
-F:MALE | WILD_TOO |
+F:MALE | WILD_ALL |
 F:FRIENDS | DROP_60 | 
 F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE
 F:EVIL | ORC
@@ -4398,7 +4398,7 @@ B:SPIT:BLIND:1d3
 B:CRUSH:SUPERHURT:8d3
 B:CRUSH:SUPERHURT:8d3
 B:CRUSH:SUPERHURT:8d3
-F:RAND_25 | IM_COLD | RES_WATE | AQUATIC | ANIMAL | WILD_TOO | RIDING
+F:RAND_25 | IM_COLD | RES_WATE | AQUATIC | ANIMAL | WILD_ALL | RIDING
 D:$It doesn't move very fast, but when it does - watch out!
 D:¤½¤ó¤Ê¤ËÁÇÁ᤯¤ÏÆ°¤«¤Ê¤¤¤¬¡¢¤â¤·Æ°¤¤¤¿¤È¤­¤ÏÃí°Õ¤·¤í¡ª
 
@@ -4559,7 +4559,7 @@ W:15:3:0:70:0:0
 B:BITE:POISON:1d6
 B:BITE:POISON:1d6
 B:BITE:POISON:1d6
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO |
+F:WEIRD_MIND | BASH_DOOR | WILD_ALL |
 F:ANIMAL | IM_POIS | DROP_SKELETON
 D:$A giant spider with hairy black and red legs.
 D:ÌÓ¤ÎÀ¸¤¨¤¿¹õ¤ÈÀ֤ΤޤÀ¤é¤Î­¤ò»ý¤Ä¡¢µðÂç¤ÊÃØéá¤À¡£
@@ -4573,7 +4573,7 @@ W:15:2:0:30:600:395
 B:BITE:HURT:2d4
 B:STING:HURT:2d4
 F:ATTR_CLEAR | 
-F:INVISIBLE | WEIRD_MIND | BASH_DOOR | WILD_TOO |
+F:INVISIBLE | WEIRD_MIND | BASH_DOOR | WILD_ALL |
 F:ANIMAL | DROP_SKELETON
 D:$It is about four feet long and carnivorous.
 D:¤½¤ì¤ÏŤµ¤¬ 1.5 ¥á¡¼¥È¥ë¶á¤¯¤â¤¢¤ëÆù¿©À¸Êª¤À¡£
@@ -4587,7 +4587,7 @@ W:15:2:0:25:0:0
 B:BITE:HURT:1d8
 B:BITE:POISON:1d6
 B:BITE:POISON:1d6
-F:FRIENDS | WILD_TOO | WILD_WOOD |
+F:FRIENDS | WILD_WOOD |
 F:WEIRD_MIND | BASH_DOOR | HURT_LITE |
 F:ANIMAL | EVIL | IM_POIS | DROP_SKELETON
 D:$A strong and powerful spider from Mirkwood forest.  Cunning and evil, it 
@@ -4603,7 +4603,7 @@ I:110:17d10:20:50:50
 W:15:1:0:75:0:0
 B:HIT:COLD:3d6
 B:HIT:HURT:2d8
-F:DROP_60 | WILD_TOO | WILD_WASTE | WILD_MOUNTAIN |
+F:DROP_60 | WILD_WASTE | WILD_MOUNTAIN |
 F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE
 F:EVIL | GIANT | MALE | AURA_COLD | EAT_GIVE_STR |
 F:IM_COLD
@@ -4618,7 +4618,7 @@ I:110:30d8:12:15:10
 W:15:1:0:70:0:0
 B:HIT:HURT:3d4
 B:BITE:HURT:2d6
-F:BASH_DOOR | CAN_FLY | WILD_TOO | WILD_WOOD | WILD_MOUNTAIN | WILD_GRASS |
+F:BASH_DOOR | CAN_FLY | WILD_WOOD | WILD_MOUNTAIN | WILD_GRASS |
 F:ANIMAL | DROP_CORPSE | RIDING
 D:$It is half lion, half eagle.  It flies menacingly towards you.
 D:¤½¤ÎÂΤÏȾʬ¤¬¥é¥¤¥ª¥ó¤Ç¡¢È¾Ê¬¤¬¥ï¥·¤À¡£¤½¤ì¤ÏËÁ¸±¼Ô¤ÎÊý¤Ø°Ò³ÅŪ¤Ë
@@ -4715,7 +4715,7 @@ W:16:3:0:40:0:0
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
-F:MALE | WILD_TOO |
+F:MALE | WILD_ALL |
 F:DROP_90 | 
 F:OPEN_DOOR | BASH_DOOR | ESCORT | DROP_SKELETON | DROP_CORPSE
 F:EVIL | ORC | CAN_SPEAK
@@ -4754,7 +4754,7 @@ G:F:G
 I:110:3d8:12:20:50
 W:16:2:0:70:0:0
 B:BITE:POISON:1d6
-F:FORCE_SLEEP | RAND_50 | RAND_25 | WILD_TOO | WILD_SWAMP |
+F:FORCE_SLEEP | RAND_50 | RAND_25 | WILD_SWAMP |
 F:WEIRD_MIND | BASH_DOOR | CAN_FLY |
 F:ANIMAL | IM_POIS
 S:1_IN_10 | 
@@ -4771,7 +4771,7 @@ W:16:2:0:54:2000:893
 B:HIT:FIRE:3d7
 B:HIT:FIRE:3d7
 F:DROP_60 | SELF_LITE_1 |
-F:OPEN_DOOR | BASH_DOOR | WILD_TOO | WILD_VOLCANO |
+F:OPEN_DOOR | BASH_DOOR | WILD_VOLCANO |
 F:EVIL | GIANT | MALE | AURA_FIRE | DROP_SKELETON | DROP_CORPSE
 F:IM_FIRE | EAT_GIVE_STR
 D:$A glowing fourteen foot tall giant.  Flames drip from its red skin.
@@ -4800,7 +4800,7 @@ W:16:3:0:55:800:332
 B:HIT:HURT:4d4
 B:HIT:HURT:4d4
 F:MALE | CAN_SWIM | IM_ACID | HAS_LITE_1 |
-F:FRIENDS | DROP_60 | WILD_TOO | WILD_SHORE |
+F:FRIENDS | DROP_60 | WILD_SHORE |
 F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON
 F:EVIL 
 D:$Intelligent lizard beings from the depths.
@@ -4834,7 +4834,7 @@ W:16:3:0:40:300:317
 B:BITE:HURT:4d4
 B:BUTT:HURT:4d4
 B:BITE:HURT:4d4
-F:ANIMAL | AQUATIC | WILD_TOO |
+F:ANIMAL | AQUATIC | WILD_ALL |
 D:$A hungry shark with a strange head.
 D:´ñ̯¤ÊƬ¤ò¤·¤¿µ²¤¨¤¿»­¤À¡£
 
@@ -4848,7 +4848,7 @@ B:HIT:SUPERHURT:4d4
 B:HIT:SUPERHURT:4d4
 B:HIT:SUPERHURT:4d4
 F:MALE | NO_FEAR | NO_STUN | BASH_DOOR | OPEN_DOOR | DROP_1D2 | HAS_LITE_1 |
-F:WILD_TOO | WILD_WASTE | DROP_SKELETON | DROP_CORPSE | EAT_BERSERKER
+F:WILD_WASTE | DROP_SKELETON | DROP_CORPSE | EAT_BERSERKER
 D:$A warrior in a battle-frenzy; he'll stop only when he drops.
 D:ÀïÆ®¶¸Íð¾õÂÖ¤ÎÀï»Î¤À¡£Èब»ß¤Þ¤ë¤Î¤ÏÅݤ줿»þ¤Î¤ß¤À¤í¤¦¡£
 
@@ -4886,7 +4886,7 @@ B:CLAW:HURT:2d6
 B:CLAW:HURT:2d6
 F:FORCE_SLEEP | RIDING |
 F:ONLY_GOLD | DROP_1D2 | CAN_FLY | DROP_CORPSE |
-F:OPEN_DOOR | BASH_DOOR | WILD_TOO | WILD_MOUNTAIN
+F:OPEN_DOOR | BASH_DOOR | WILD_MOUNTAIN
 F:ANIMAL
 S:1_IN_11 | 
 S:SCARE | CONF
@@ -4921,7 +4921,7 @@ B:HIT:HURT:1d4
 B:HIT:HURT:1d4
 B:BITE:HURT:1d6
 F:MALE | 
-F:FRIENDS | DROP_60 | WILD_TOO | WILD_WOOD | DROP_SKELETON | DROP_CORPSE
+F:FRIENDS | DROP_60 | WILD_WOOD | DROP_SKELETON | DROP_CORPSE
 F:OPEN_DOOR | BASH_DOOR | REGENERATE |
 F:EVIL | TROLL | HURT_LITE
 D:$He is green skinned and ugly.
@@ -4974,7 +4974,7 @@ I:110:100d3:20:60:20
 W:17:2:0:80:1200:387
 B:BITE:HURT:2d6
 B:BITE:HURT:2d6
-F:FORCE_SLEEP | WILD_TOO | WILD_SHORE | WILD_SWAMP |
+F:FORCE_SLEEP | WILD_SHORE | WILD_SWAMP |
 F:ONLY_GOLD | DROP_1D2 | CAN_SWIM | DROP_SKELETON | DROP_CORPSE
 F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | 
 F:ANIMAL | RIDING
@@ -4990,7 +4990,7 @@ I:110:10d20:20:60:30
 W:17:2:0:80:0:0
 B:CLAW:TERRIFY:2d5
 B:CLAW:TERRIFY:5d2
-F:CAN_SWIM | OPEN_DOOR | BASH_DOOR | WILD_TOO | WILD_SWAMP
+F:CAN_SWIM | OPEN_DOOR | BASH_DOOR | WILD_SWAMP
 D:$A creature that was once human, but is now as green as moss.
 D:ÀΤϿʹ֤À¤Ã¤¿¤¬¡¢º£¤ÏÂݤΤ褦¤ËÎФÀ¡£»ö¸Î¤Ë¤¢¤Ã¤Æ²Ð¥À¥ë¥Þ¤Ë¤Ê¤ê
 D:¾Â¤ËÈô¤Ó¹þ¤ó¤À²Ê³Ø¼Ô¤¬¡¢ÂݤäÁô¤ÈÍ»¹ç¤·¤ÆÀ¸¤Þ¤ì¤¿¡£
@@ -5018,7 +5018,7 @@ I:110:11d8:12:44:20
 W:17:1:0:62:400:331
 B:BITE:HURT:2d4
 B:STING:LOSE_STR:1d7
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO |
+F:WEIRD_MIND | BASH_DOOR | WILD_ALL |
 F:ANIMAL | DROP_SKELETON
 D:$It is fast and poisonous.
 D:¤½¤ÎÆ°¤­¤ÏÁÇÁ᤯¡¢ÆǤò»ý¤Ã¤Æ¤¤¤ë¡£
@@ -5049,7 +5049,7 @@ B:HIT:FIRE:2d6
 B:HIT:FIRE:2d6
 F:RAND_25 | SELF_LITE_1 |
 F:EMPTY_MIND | BASH_DOOR | CAN_FLY | NONLIVING |
-F:EVIL | IM_FIRE | IM_POIS | WILD_TOO | WILD_VOLCANO |
+F:EVIL | IM_FIRE | IM_POIS | WILD_VOLCANO |
 F:NO_CONF | NO_SLEEP | NO_FEAR | AURA_FIRE
 D:$A whirlwind of sentient flame.
 D:ÃÎǽ¤ò»ý¤Ã¤¿²Ð±ê¤Î±²´¬¤­¤À¡£
@@ -5240,7 +5240,7 @@ I:110:20d6:20:16:40
 W:18:2:0:75:0:0
 B:HIT:HURT:1d8
 B:HIT:HURT:1d8
-F:ONLY_GOLD | DROP_90 | WILD_TOO | WILD_SWAMP |
+F:ONLY_GOLD | DROP_90 | WILD_SWAMP |
 F:STUPID | EMPTY_MIND | OPEN_DOOR | BASH_DOOR | 
 F:EVIL | 
 F:NO_CONF | NO_SLEEP | NO_FEAR
@@ -5260,7 +5260,7 @@ I:120:10d10:20:50:10
 W:18:1:0:68:400:386
 B:BITE:HURT:3d5
 B:BITE:HURT:3d5
-F:ANIMAL | AQUATIC | WILD_TOO |
+F:ANIMAL | AQUATIC | WILD_ALL |
 D:$Fast moving hunter of the depths, when this creature moves, 
 D:$everybody in water is in danger!
 D:ÁÇÁ᤯ư¤¯¿¼³¤¤Î¥Ï¥ó¥¿¡¼¤À¡£
@@ -5313,7 +5313,7 @@ I:120:3d8:12:20:50
 W:18:1:0:70:0:0
 F:FORCE_SLEEP | NEVER_BLOW | 
 F:RAND_50 | RAND_25 | CAN_FLY |
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | WILD_MOUNTAIN |
+F:WEIRD_MIND | BASH_DOOR | WILD_MOUNTAIN |
 F:ANIMAL | NO_CONF | NO_SLEEP
 S:1_IN_9 | 
 S:BR_CONF
@@ -5331,7 +5331,7 @@ B:HIT:HURT:3d8
 B:HIT:HURT:3d8
 F:DROP_60 | 
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE
-F:EVIL | GIANT | MALE | WILD_TOO | WILD_MOUNTAIN | EAT_GIVE_STR
+F:EVIL | GIANT | MALE | WILD_MOUNTAIN | EAT_GIVE_STR
 D:$It is eighteen feet tall and looking at you.
 D:¤½¤ì¤ÏÇؾ椬 5 ¥á¡¼¥È¥ë°Ê¾å¤â¤¢¤Ã¤Æ¡¢ËÁ¸±¼Ô¤ò¸«²¼¤í¤·¤Æ¤¤¤ë¡£
 
@@ -5342,7 +5342,7 @@ G:F:D
 I:120:3d8:12:20:50
 W:18:2:0:68:0:0
 F:FORCE_SLEEP | NEVER_BLOW | RAND_50 | RAND_25 | 
-F:WEIRD_MIND | BASH_DOOR | CAN_FLY | WILD_TOO | WILD_SWAMP |
+F:WEIRD_MIND | BASH_DOOR | CAN_FLY | WILD_SWAMP |
 F:ANIMAL | IM_ACID
 S:1_IN_9 | 
 S:BR_ACID
@@ -5387,7 +5387,7 @@ I:120:3d8:12:20:50
 W:18:2:0:78:0:0
 B:BITE:HURT:1d3
 F:FORCE_SLEEP | 
-F:RAND_50 | RAND_25 | WILD_TOO | WILD_MOUNTAIN |
+F:RAND_50 | RAND_25 | WILD_MOUNTAIN |
 F:WEIRD_MIND | BASH_DOOR | 
 F:ANIMAL | IM_FIRE | CAN_FLY
 S:1_IN_9 | 
@@ -5441,7 +5441,7 @@ I:110:10d10:20:40:20
 W:19:1:0:80:0:0
 B:STING:POISON:2d7
 B:STING:POISON:2d7
-F:ANIMAL | EVIL | AQUATIC | IM_POIS | WILD_TOO |
+F:ANIMAL | EVIL | AQUATIC | IM_POIS | WILD_ALL |
 S:1_IN_6
 S:TELE_TO | HEAL | SCARE | CAUSE_2 | BLIND | S_MONSTER
 D:$A devil ray of the depths, with priestly magic.
@@ -5496,7 +5496,7 @@ W:20:2:0:60:0:0
 B:BITE:HURT:1d8
 B:BITE:POISON:1d6
 B:BITE:POISON:1d6
-F:FRIENDS | WILD_TOO | WILD_WOOD | DROP_SKELETON
+F:FRIENDS | WILD_WOOD | DROP_SKELETON
 F:WEIRD_MIND | BASH_DOOR | CAN_SWIM |
 F:ANIMAL | IM_POIS | RES_TELE
 S:1_IN_5 | 
@@ -5549,7 +5549,7 @@ B:BITE:HURT:2d6
 B:STING:POISON:1d6
 F:FORCE_SLEEP | 
 F:ONLY_GOLD | DROP_60 | DROP_90 | IM_POIS | CAN_FLY |
-F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | DRAGON | WILD_TOO |
+F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | DRAGON |
 F:WILD_WOOD | WILD_MOUNTAIN | DROP_SKELETON | DROP_CORPSE |
 F:ANIMAL | EVIL | RIDING | EAT_POISONOUS
 D:$A fast-moving and deadly dragonian animal. Beware its poisonous sting!
@@ -5639,7 +5639,7 @@ B:CLAW:HURT:1d10
 B:CLAW:HURT:1d10
 B:BITE:HURT:1d10
 B:BITE:HURT:1d10
-F:BASH_DOOR | WILD_WOOD | WILD_TOO | WILD_GRASS |
+F:BASH_DOOR | WILD_WOOD | WILD_GRASS |
 F:ANIMAL | DROP_SKELETON | DROP_CORPSE | EAT_SPEED
 D:$A fierce and dangerous cat, its huge tusks and sharp claws would lacerate 
 D:$even the strongest armour.
@@ -5677,7 +5677,7 @@ B:BITE:HURT:1d10
 B:BITE:FIRE:1d3
 B:BITE:FIRE:1d3
 F:FORCE_SLEEP | CAN_FLY | DROP_CORPSE |
-F:BASH_DOOR | WILD_TOO | WILD_MOUNTAIN |
+F:BASH_DOOR | WILD_MOUNTAIN |
 F:IM_FIRE | RIDING
 S:1_IN_10 | 
 S:BR_FIRE
@@ -5716,7 +5716,7 @@ W:20:3:0:180:0:0
 B:CLAW:HURT:1d10
 B:CLAW:HURT:1d10
 B:BITE:HURT:2d8
-F:OPEN_DOOR | BASH_DOOR | WILD_TOO | WILD_MOUNTAIN | WILD_WOOD | WILD_WASTE |
+F:OPEN_DOOR | BASH_DOOR | WILD_MOUNTAIN | WILD_WOOD | WILD_WASTE |
 F:ANIMAL | IM_COLD | DROP_SKELETON | DROP_CORPSE
 D:$A tall shaggy, furry humanoid, it could call the yeti brother.
 D:Çؤ¬¹â¤¯ÌÓ¿¼¤¤¿Í´Ö·¿¤ÎÀ¸Êª¤À¡£¤½¤ì¤Ï·»Äï¤Ç¤¢¤ë¥¤¥¨¥Æ¥£¤ò¸Æ¤Ö¤³¤È¤¬¤¢¤ë¡£
@@ -5745,7 +5745,7 @@ W:20:4:0:175:3000:594
 B:CRUSH:HURT:1d20
 B:CRUSH:HURT:1d20
 F:RAND_25 | FORCE_MAXHP | RES_WATE
-F:ANIMAL | AQUATIC | WILD_TOO |
+F:ANIMAL | AQUATIC | WILD_ALL |
 D:$Although it looks like a fish and lives in water, it is in fact 
 D:$a mammal. And it is huge!
 D:¤½¤ì¤Ï¿å¤ÎÃæ¤Ë¤¹¤ó¤Ç¤¤¤ë¤Î¤Çµû¤Î¤è¤¦¤Ë¸«¤¨¤ë¤¬ 
@@ -5761,7 +5761,7 @@ W:20:2:0:145:0:0
 B:TOUCH:ELEC:2d7
 B:TOUCH:ELEC:7d2
 B:TOUCH:ELEC:2d7
-F:AQUATIC | ANIMAL | RAND_25 | IM_ELEC | RES_WATE | WILD_TOO |
+F:AQUATIC | ANIMAL | RAND_25 | IM_ELEC | RES_WATE | WILD_ALL |
 D:$This cute little serpentine creature can create a deadly voltage. 
 D:$Better watch out!
 D:¤³¤Î¾®¤µ¤Ê¶Ê¤¬¤ê¤¯¤Í¤Ã¤¿À¸¤­Êª¤ÏÃ×̿Ū¤ÊÅÅ°µ¤òȯ¤¹¤ë»ö¤¬½ÐÍè¤ë¡£ 
@@ -5908,7 +5908,7 @@ G:v:r
 I:110:9d9:100:30:0
 W:21:1:0:100:0:0
 B:ENGULF:FIRE:3d3
-F:FORCE_SLEEP | RAND_50 | CAN_FLY | WILD_VOLCANO | WILD_TOO | SELF_LITE_2 |
+F:FORCE_SLEEP | RAND_50 | CAN_FLY | WILD_VOLCANO | WILD_ALL | SELF_LITE_2 |
 F:EMPTY_MIND | BASH_DOOR | POWERFUL | AURA_FIRE |
 F:IM_FIRE | NO_FEAR | NO_CONF | NO_SLEEP | NO_STUN |  NONLIVING
 S:1_IN_6 | 
@@ -6008,7 +6008,7 @@ W:21:1:0:200:0:0
 B:BITE:POISON:5d5
 B:BITE:POISON:5d5
 F:EMPTY_MIND | BASH_DOOR | AQUATIC | 
-F:IM_POIS | NO_STUN | WILD_TOO | FORCE_MAXHP
+F:IM_POIS | NO_STUN | WILD_ALL | FORCE_MAXHP
 S:1_IN_7 | 
 S:BR_POIS
 D:$This cute fish is among the most poisonous creatures there are.
@@ -6059,7 +6059,7 @@ I:115:30d10:12:55:30
 W:22:1:0:85:0:0
 B:BITE:HURT:8d3
 B:BITE:HURT:8d3
-F:AQUATIC | WILD_TOO | WILD_OCEAN
+F:AQUATIC | WILD_OCEAN
 F:ANIMAL
 D:$An almost beautiful, deadly beast.
 D:¤½¤ì¤Ï¤È¤Æ¤âÈþ¤·¤¤¤ÈƱ»þ¤Ë´í¸±¤Ê½Ã¤À¡£
@@ -6102,7 +6102,7 @@ I:110:10d8:12:55:10
 W:22:1:0:40:0:0
 B:ENGULF:EXP_VAMP:2d6
 F:RAND_25 | 
-F:IM_COLD | IM_POIS | IM_ACID | RES_NETH | WILD_TOO | WILD_SWAMP |
+F:IM_COLD | IM_POIS | IM_ACID | RES_NETH | WILD_SWAMP |
 F:EVIL | EMPTY_MIND | COLD_BLOOD | FRIENDS
 D:$A cloud of evil, sentient mist.
 D:°Õ¼±¤ò»ý¤Ã¤¿¼Ù°­¤Ê̸¤À¡£
@@ -6115,7 +6115,7 @@ I:110:20d8:12:55:30
 W:22:1:0:80:0:0
 B:CLAW:HURT:1d12
 B:CLAW:HURT:1d12
-F:RAND_25 | WILD_TOO | DROP_CORPSE |
+F:RAND_25 | WILD_ALL | DROP_CORPSE |
 F:WEIRD_MIND | BASH_DOOR | 
 F:ANIMAL | CAN_FLY
 D:$It is a giant beetle with vicious claws.
@@ -6161,7 +6161,7 @@ I:110:12d8:12:38:20
 W:22:1:0:60:700:524
 B:BITE:HURT:1d8
 B:STING:POISON:2d5
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO |
+F:WEIRD_MIND | BASH_DOOR | WILD_ALL |
 F:ANIMAL | DROP_SKELETON
 D:$It is a giant scorpion with a sharp stinger.
 D:¤½¤ì¤Ï±Ô¤¤»É¤ò»ý¤Ã¤¿µðÂç¤Ê¥µ¥½¥ê¤À¡£
@@ -6313,7 +6313,7 @@ I:110:20d8:14:55:30
 W:23:1:0:85:1000:421
 B:BITE:HURT:4d5
 F:RAND_25 | 
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | DROP_CORPSE
+F:WEIRD_MIND | BASH_DOOR | WILD_ALL | DROP_CORPSE
 F:ANIMAL | CAN_FLY
 D:$It is looking for prey.
 D:¤½¤ì¤ÏÀ¸¤±ìÓ¤òõ¤·¤Æ¤¤¤ë¡£
@@ -6478,7 +6478,7 @@ B:BITE:HURT:2d6
 B:BITE:HURT:2d6
 B:BITE:HURT:2d6
 F:FORCE_SLEEP | 
-F:ONLY_GOLD | DROP_4D2 | WILD_TOO | WILD_SWAMP | WILD_SHORE |
+F:ONLY_GOLD | DROP_4D2 | WILD_SWAMP | WILD_SHORE |
 F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | DROP_SKELETON | DROP_CORPSE
 F:ANIMAL | RIDING
 S:1_IN_7 | 
@@ -6791,7 +6791,7 @@ B:GAZE:EXP_20
 B:CRAWL:ACID:2d4
 B:BITE:HURT:1d10
 B:BITE:POISON:1d6
-F:BASH_DOOR | EVIL | CAN_SWIM | WILD_TOO | WILD_SWAMP
+F:BASH_DOOR | EVIL | CAN_SWIM | WILD_SWAMP
 F:ANIMAL | IM_ACID | DROP_CORPSE | EAT_ACIDIC
 D:$A huge wormlike shape dripping acid, twisted by evil sorcery into a foul 
 D:$monster that breeds on death.
@@ -6805,7 +6805,7 @@ G:K:R
 I:110:20d8:14:50:30
 W:25:2:0:85:0:0
 B:BITE:LOSE_STR:4d4
-F:RAND_25 | WILD_TOO |
+F:RAND_25 | WILD_ALL |
 F:WEIRD_MIND | BASH_DOOR | DROP_CORPSE
 F:ANIMAL | CAN_FLY | EAT_LOSE_STR
 D:$A giant beetle with poisonous mandibles.
@@ -6819,7 +6819,7 @@ I:110:22d22:20:50:20
 W:26:1:0:120:0:0
 B:STING:POISON:2d8
 B:STING:EXP_VAMP:2d8
-F:ANIMAL | EVIL | AQUATIC | RES_NETH | IM_POIS | WILD_TOO
+F:ANIMAL | EVIL | AQUATIC | RES_NETH | IM_POIS | WILD_ALL
 S:1_IN_6
 S:HEAL | SCARE | CAUSE_3 | BLIND | FORGET | HASTE
 D:$A devil ray of the depths, with vampiric powers.
@@ -6943,7 +6943,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_TOO | HAS_LITE_2 |
+F:FORCE_MAXHP | WILD_ALL | HAS_LITE_2 |
 F:ONLY_ITEM | DROP_90 | DROP_GOOD | 
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
 F:EVIL
@@ -7101,7 +7101,7 @@ I:110:13d8:14:45:30
 W:27:1:0:95:800:474
 B:BITE:HURT:3d4
 B:SPIT:FIRE:4d5
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | WILD_VOLCANO | DROP_CORPSE
+F:WEIRD_MIND | BASH_DOOR | WILD_VOLCANO | DROP_CORPSE
 F:ANIMAL | IM_FIRE | CAN_FLY | EAT_FIRE_RES
 D:$It is a giant beetle wreathed in flames.
 D:¤½¤ì¤Ï²Ð±ê¤Ë¼è¤ê´¬¤«¤ì¤¿µðÂç¤Ê¹ÃÃî¤À¡£
@@ -7149,7 +7149,7 @@ W:27:1:0:150:1200:454
 B:CLAW:POISON:3d3
 B:CLAW:POISON:3d3
 B:BITE:HURT:1d6
-F:FRIENDS | DROP_60 | WILD_WOOD | WILD_MOUNTAIN | WILD_TOO | WILD_SWAMP
+F:FRIENDS | DROP_60 | WILD_WOOD | WILD_MOUNTAIN | WILD_SWAMP
 F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | EAT_POISONOUS | REGENERATE |
 F:EVIL | TROLL
 D:$A powerful troll form.  Venom drips from its needlelike claws.
@@ -7205,7 +7205,7 @@ I:110:25d17:20:50:40
 W:27:1:0:175:6000:653
 B:HIT:HURT:1d8
 B:HIT:HURT:1d8
-F:FRIENDS | DROP_60 | OPEN_DOOR | BASH_DOOR | WILD_TOO |
+F:FRIENDS | DROP_60 | OPEN_DOOR | BASH_DOOR |
 F:WILD_MOUNTAIN | WILD_WASTE | DROP_SKELETON | DROP_CORPSE
 F:EVIL 
 S:1_IN_6
@@ -7266,7 +7266,7 @@ B:HIT:HURT:3d8
 B:HIT:HURT:3d8
 B:HIT:HURT:3d8
 F:FORCE_SLEEP | 
-F:DROP_1D2 | WILD_TOO | WILD_MOUNTAIN |
+F:DROP_1D2 | WILD_MOUNTAIN |
 F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE
 F:EVIL | GIANT
 S:1_IN_4 | 
@@ -7288,7 +7288,7 @@ W:27:2:0:1500:0:0
 B:HIT:SUPERHURT:5d6
 B:HIT:SUPERHURT:5d6
 B:HIT:SUPERHURT:5d6
-F:UNIQUE | MALE | CAN_SPEAK | WILD_TOO | WILD_SWAMP | WILD_SHORE |
+F:UNIQUE | MALE | CAN_SPEAK | WILD_SWAMP | WILD_SHORE |
 F:FORCE_MAXHP | 
 F:ESCORT | HAS_LITE_2 |
 F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | DROP_CORPSE
@@ -7411,7 +7411,7 @@ B:CRUSH:HURT:2d8
 B:CRUSH:HURT:2d8
 B:CRUSH:HURT:2d8
 B:CRUSH:HURT:2d8
-F:WILD_TOO | WILD_GRASS |
+F:WILD_GRASS |
 F:INVISIBLE | OPEN_DOOR | BASH_DOOR | 
 F:EVIL | NO_CONF | NO_SLEEP
 D:$A creature who lives underground and eats surface 
@@ -7470,7 +7470,7 @@ B:BITE:POISON:4d4
 F:FORCE_SLEEP | 
 F:ONLY_GOLD | DROP_1D2 | DROP_4D2 | DROP_SKELETON | DROP_CORPSE | RIDING
 F:BASH_DOOR | MOVE_BODY | CAN_SWIM | EAT_POISONOUS |
-F:ANIMAL | IM_POIS | WILD_TOO | WILD_SHORE | WILD_SWAMP |
+F:ANIMAL | IM_POIS | WILD_SHORE | WILD_SWAMP |
 S:1_IN_5 | 
 S:SCARE | BA_POIS
 D:$A strange reptilian hybrid with five heads dripping venom.
@@ -7525,7 +7525,7 @@ B:BITE:PARALYZE:4d5
 B:BITE:LOSE_DEX:4d5
 B:BITE:LOSE_CON:4d5
 F:FORCE_SLEEP | AQUATIC | GOOD | ANIMAL |
-F:IM_COLD | IM_POIS | IM_FIRE | IM_ELEC | WILD_TOO | WILD_OCEAN 
+F:IM_COLD | IM_POIS | IM_FIRE | IM_ELEC | WILD_OCEAN 
 S:1_IN_5 | 
 S:BO_WATE | BO_COLD | BO_ICEE | BO_MANA
 D:$Your mind is filled with admiration as you view this wondrous, 
@@ -7542,7 +7542,7 @@ W:28:2:0:350:2000:490
 B:HIT:HURT:9d8
 B:HIT:HURT:9d8
 F:FORCE_SLEEP | 
-F:DROP_1D2 | TAKE_ITEM | WILD_TOO | WILD_SHORE | WILD_MOUNTAIN |
+F:DROP_1D2 | TAKE_ITEM | WILD_SHORE | WILD_MOUNTAIN |
 F:BASH_DOOR | OPEN_DOOR | MOVE_BODY | DROP_CORPSE | EAT_GIVE_STR |
 F:EVIL | IM_POIS | IM_ACID | GIANT
 S:1_IN_8 | 
@@ -7594,7 +7594,7 @@ B:GAZE:BLIND:2d4
 B:BUTT:HURT:2d6
 B:BITE:HURT:2d12
 F:ONLY_GOLD | DROP_2D2 | DROP_CORPSE | EVIL |
-F:BASH_DOOR | CAN_SWIM | WILD_TOO | WILD_SWAMP |
+F:BASH_DOOR | CAN_SWIM | WILD_SWAMP |
 F:ANIMAL | IM_POIS | RIDING | EAT_BLIND
 D:$A strange ox-like form with a huge head but a thin, weak neck, it looks 
 D:$like the creation of some deranged alchemist.
@@ -7683,7 +7683,7 @@ W:28:5:0:150:0:0
 B:CLAW:POISON:2d4
 B:CLAW:POISON:2d4
 B:BITE:HURT:4d4
-F:FRIENDS | WILD_TOO | WILD_SHORE | DROP_CORPSE
+F:FRIENDS | WILD_SHORE | DROP_CORPSE
 F:RAND_25 | EAT_POISONOUS |
 F:DROP_60 | DROP_90 |
 F:CAN_SWIM | BASH_DOOR | ELDRITCH_HORROR | RES_TELE |
@@ -7723,7 +7723,7 @@ B:GAZE:PARALYZE
 B:BITE:HURT:2d12
 B:BITE:HURT:2d12
 B:BITE:HURT:2d12
-F:ONLY_ITEM | DROP_1D2 | WILD_TOO | WILD_MOUNTAIN |
+F:ONLY_ITEM | DROP_1D2 | WILD_MOUNTAIN |
 F:OPEN_DOOR | BASH_DOOR | EVIL | IM_POIS | DROP_CORPSE
 F:ANIMAL | NO_CONF | NO_SLEEP | CAN_SWIM | EAT_POISONOUS |
 S:1_IN_8
@@ -7744,7 +7744,7 @@ B:HIT:HURT:1d5
 B:HIT:HURT:1d5
 B:BITE:COLD:3d6
 F:MALE | 
-F:FRIENDS | DROP_60 | WILD_TOO | WILD_WASTE | DROP_SKELETON | DROP_CORPSE
+F:FRIENDS | DROP_60 | WILD_WASTE | DROP_SKELETON | DROP_CORPSE
 F:OPEN_DOOR | BASH_DOOR | REGENERATE |
 F:EVIL | TROLL | IM_COLD | HURT_LITE
 D:$He is a white troll with powerfully clawed hands.
@@ -7856,7 +7856,7 @@ W:29:1:0:300:4000:560
 B:CLAW:HURT:1d4
 B:CLAW:HURT:1d4
 B:BITE:HURT:1d6
-F:FORCE_SLEEP | FORCE_MAXHP | WILD_TOO | WILD_MOUNTAIN | WILD_WOOD |
+F:FORCE_SLEEP | FORCE_MAXHP | WILD_MOUNTAIN | WILD_WOOD |
 F:DROP_60 | DROP_90 | DROP_1D2 | DROP_CORPSE | EAT_ELEC_RES |
 F:OPEN_DOOR | BASH_DOOR | CAN_FLY |
 F:EVIL | DRAGON | IM_ELEC | RIDING | SELF_LITE_1 |
@@ -7877,7 +7877,7 @@ W:29:1:0:275:4000:549
 B:CLAW:HURT:1d4
 B:CLAW:HURT:1d4
 B:BITE:HURT:1d6
-F:FORCE_SLEEP | FORCE_MAXHP | WILD_TOO | WILD_MOUNTAIN | WILD_WASTE |
+F:FORCE_SLEEP | FORCE_MAXHP | WILD_MOUNTAIN | WILD_WASTE |
 F:DROP_60 | DROP_90 | DROP_1D2 | DROP_CORPSE | EAT_COLD_RES |
 F:OPEN_DOOR | BASH_DOOR | CAN_FLY |
 F:EVIL | DRAGON | IM_COLD | RIDING
@@ -7899,7 +7899,7 @@ W:29:1:0:290:4000:561
 B:CLAW:HURT:1d4
 B:CLAW:HURT:1d4
 B:BITE:HURT:1d6
-F:FORCE_SLEEP | FORCE_MAXHP | WILD_TOO | WILD_MOUNTAIN | WILD_SWAMP |
+F:FORCE_SLEEP | FORCE_MAXHP | WILD_MOUNTAIN | WILD_SWAMP |
 F:DROP_60 | DROP_90 | DROP_1D2 | DROP_CORPSE | EAT_POIS_RES |
 F:OPEN_DOOR | BASH_DOOR | CAN_FLY |
 F:EVIL | DRAGON | IM_POIS | RIDING
@@ -7921,7 +7921,7 @@ W:29:3:0:310:4000:562
 B:CLAW:HURT:1d4
 B:CLAW:HURT:1d4
 B:BITE:HURT:1d6
-F:FORCE_SLEEP | FORCE_MAXHP | WILD_TOO | WILD_MOUNTAIN | 
+F:FORCE_SLEEP | FORCE_MAXHP | WILD_MOUNTAIN | 
 F:DROP_60 | DROP_90 | DROP_2D2 | DROP_CORPSE |
 F:OPEN_DOOR | BASH_DOOR | CAN_FLY |
 F:DRAGON | NO_CONF | NO_SLEEP | RIDING
@@ -8013,7 +8013,7 @@ B:BITE:HURT:22d1
 B:BITE:HURT:11d2
 B:BITE:HURT:22d1
 F:FORCE_MAXHP | TAKE_ITEM | UNIQUE | MOVE_BODY | 
-F:WILD_OCEAN | WILD_TOO |
+F:WILD_OCEAN |
 F:BASH_DOOR | IM_COLD | IM_ELEC | IM_POIS | ANIMAL | AQUATIC |
 F:NO_CONF | NO_SLEEP | DROP_1D2
 D:$The biggest white shark who has ever lived, it is hunting for you now! 
@@ -8041,7 +8041,7 @@ G:a:b
 I:110:8d8:10:50:60
 W:30:2:0:80:1000:473
 B:BITE:ELEC:5d5
-F:RAND_25 | WILD_TOO | DROP_CORPSE
+F:RAND_25 | WILD_ALL | DROP_CORPSE
 F:WEIRD_MIND | BASH_DOOR | 
 F:ANIMAL | IM_ELEC
 D:$It is a giant ant that crackles with energy.
@@ -8097,7 +8097,7 @@ B:HIT:HURT:3d4
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
 F:FORCE_SLEEP | FORCE_MAXHP |
-F:BASH_DOOR | CAN_FLY | WILD_TOO | WILD_WOOD | DROP_CORPSE | RIDING
+F:BASH_DOOR | CAN_FLY | WILD_WOOD | DROP_CORPSE | RIDING
 F:EVIL
 S:1_IN_5 | 
 S:ARROW_4
@@ -8129,7 +8129,7 @@ I:110:22d10:14:60:30
 W:30:2:0:200:800:478
 B:BITE:HURT:5d8
 B:BITE:HURT:5d8
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | WILD_GRASS | DROP_CORPSE
+F:WEIRD_MIND | BASH_DOOR | WILD_GRASS | DROP_CORPSE
 F:ANIMAL | CAN_FLY
 D:$It is a beetle with deadly sharp cutting mandibles and a rock-hard 
 D:$carapace.
@@ -8145,7 +8145,7 @@ B:BUTT:HURT:3d9
 B:BUTT:HURT:3d9
 B:BITE:POISON:1d10
 B:KICK:HURT:2d4
-F:FORCE_SLEEP | ANIMAL | MOVE_BODY | WILD_TOO | WILD_WOOD |
+F:FORCE_SLEEP | ANIMAL | MOVE_BODY | WILD_WOOD |
 F:BASH_DOOR | IM_POIS | IM_ACID | DROP_CORPSE | EVIL | RIDING | EAT_POISONOUS |
 S:1_IN_8 | 
 S:BR_POIS
@@ -8214,7 +8214,7 @@ I:110:25d12:16:60:30
 W:31:3:0:190:2000:586
 B:BITE:HURT:5d4
 B:WAIL:TERRIFY:5d6
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | DROP_CORPSE
+F:WEIRD_MIND | BASH_DOOR | WILD_ALL | DROP_CORPSE
 F:ANIMAL | CAN_FLY
 D:$It is a giant beetle that produces a chilling sound.
 D:¤½¤ì¤Ï´¨µ¤¤ò¤â¤è¤ª¤¹Íͤʱ©²»¤òΩ¤Æ¤ëµðÂç¤Ê¹ÃÃî¤À¡£
@@ -8291,7 +8291,7 @@ B:CRUSH:HURT:8d4
 B:CRUSH:HURT:8d4
 B:CRUSH:HURT:8d4
 F:IM_ACID | RES_WATE | AQUATIC | ANIMAL | IM_COLD | MOVE_BODY | RIDING
-F:FORCE_MAXHP | WILD_TOO | WILD_OCEAN |
+F:FORCE_MAXHP | WILD_OCEAN |
 S:1_IN_8
 S:BR_ELEC | BR_ACID | BR_POIS
 D:$Besides being capable of dragging whole ships underwater, 
@@ -8384,7 +8384,7 @@ W:35:1:0:1500:0:0
 B:HIT:ELEC:3d8
 B:HIT:ELEC:3d8
 B:HIT:ELEC:3d8
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_1D2 | WILD_TOO | WILD_MOUNTAIN |
+F:FORCE_SLEEP | FORCE_MAXHP | DROP_1D2 | WILD_MOUNTAIN |
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | AURA_ELEC | DROP_SKELETON | DROP_CORPSE
 F:EVIL | GIANT | IM_COLD | IM_ELEC | MALE | SELF_LITE_1 | EAT_GIVE_STR |
 S:1_IN_8 | 
@@ -8513,7 +8513,7 @@ B:BITE:HURT:2d3
 F:UNIQUE | MALE | 
 F:FORCE_MAXHP | 
 F:ESCORT | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | WILD_TOO | WILD_WOOD | REGENERATE |
+F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | WILD_WOOD | REGENERATE |
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE
 F:EVIL | TROLL | IM_COLD | IM_POIS | HURT_LITE | HURT_ROCK
 D:$Big, brawny, powerful and with a taste for hobbit.  He has friends called 
@@ -8533,7 +8533,7 @@ B:BITE:HURT:2d3
 F:UNIQUE | MALE | 
 F:FORCE_MAXHP | 
 F:ESCORT | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | WILD_TOO | WILD_WOOD | REGENERATE |
+F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | WILD_WOOD | REGENERATE |
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE
 F:EVIL | TROLL | IM_COLD | IM_POIS | HURT_LITE | HURT_ROCK
 D:$Big, brawny, powerful and with a taste for hobbit.  He has friends called 
@@ -8553,7 +8553,7 @@ B:BITE:HURT:2d3
 F:UNIQUE | MALE | 
 F:FORCE_MAXHP | 
 F:ESCORT | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | WILD_TOO | WILD_WOOD | REGENERATE |
+F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | WILD_WOOD | REGENERATE |
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE
 F:EVIL | TROLL | IM_COLD | IM_POIS | HURT_LITE | HURT_ROCK
 D:$Big, brawny, powerful and with a taste for hobbit.  He has friends called 
@@ -8753,7 +8753,7 @@ B:SLASH:HURT:25d1
 B:SLASH:HURT:30d1
 #F:UNIQUE | MALE | WEIRD_MIND | CAN_SPEAK |
 F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_MAXHP | WILD_TOO | DROP_CORPSE
+F:FORCE_MAXHP | WILD_ALL | DROP_CORPSE
 F:ONLY_ITEM | DROP_1D2 | DROP_GOOD |
 F:DROP_CHOSEN |
 F:OPEN_DOOR | BASH_DOOR | 
@@ -8777,7 +8777,7 @@ B:HIT:HURT:5d5
 B:BITE:HURT:2d10
 B:HIT:EAT_GOLD:2d2
 F:UNIQUE | MALE | CAN_SPEAK |
-F:FORCE_MAXHP | WILD_TOO | DROP_CORPSE
+F:FORCE_MAXHP | WILD_ALL | DROP_CORPSE
 F:ESCORT | EAT_GIVE_STR |
 F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
@@ -8838,7 +8838,7 @@ B:HIT:HURT:1d9
 B:HIT:HURT:1d9
 B:HIT:HURT:2d2
 B:HIT:HURT:2d2
-F:MALE | WILD_TOO | WILD_SHORE | WILD_SWAMP | REGENERATE |
+F:MALE | WILD_SHORE | WILD_SWAMP | REGENERATE |
 F:FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE
 F:FRIENDS | DROP_60 | 
 F:OPEN_DOOR | BASH_DOOR | CAN_SWIM |
@@ -8860,7 +8860,7 @@ W:33:2:0:350:0:0
 B:HIT:FIRE:4d6
 B:HIT:FIRE:4d6
 F:FORCE_SLEEP | RAND_25 | SELF_LITE_1 |
-F:EMPTY_MIND | CAN_FLY | WILD_TOO | WILD_VOLCANO |
+F:EMPTY_MIND | CAN_FLY | WILD_VOLCANO |
 F:KILL_ITEM | KILL_BODY | BASH_DOOR | AURA_FIRE |
 F:EVIL | IM_FIRE | IM_POIS | NONLIVING |
 F:NO_CONF | NO_SLEEP | NO_FEAR
@@ -9142,7 +9142,7 @@ I:120:18d20:12:50:40
 W:34:4:0:275:0:0
 B:BITE:HURT:1d6
 B:STING:POISON:1d4
-F:WEIRD_MIND | BASH_DOOR | WILD_TOO | DROP_SKELETON |
+F:WEIRD_MIND | BASH_DOOR | WILD_ALL | DROP_SKELETON |
 F:ANIMAL
 D:$It is a giant grey scorpion.  It looks poisonous.
 D:¤½¤ì¤Ï³¥¿§¤ÎµðÂç¤Ê¥µ¥½¥ê¤À¡£¤½¤ì¤ÏÆǤò»ý¤Ã¤Æ¤¤¤ë¤è¤¦¤À¡£
@@ -9217,7 +9217,7 @@ B:CLAW:HURT:2d6
 B:CLAW:HURT:2d6
 B:BITE:HURT:1d6
 F:DROP_60 | ONLY_GOLD | EVIL | DEMON | FRIENDS | HURT_LITE |
-F:WILD_TOO | WILD_MOUNTAIN | WILD_WASTE |
+F:WILD_MOUNTAIN | WILD_WASTE |
 F:IM_POIS | IM_FIRE | IM_COLD | IM_ELEC | HURT_ROCK | NONLIVING 
 S:1_IN_12
 S:BR_ELEC | BR_FIRE
@@ -9540,7 +9540,7 @@ B:HIT:HURT:3d2
 B:HIT:HURT:3d2
 F:MALE | 
 F:FORCE_MAXHP | AQUATIC |
-F:FRIENDS | DROP_60 | WILD_TOO | WILD_OCEAN | REGENERATE |
+F:FRIENDS | DROP_60 | WILD_OCEAN | REGENERATE |
 F:OPEN_DOOR | BASH_DOOR | RES_WATE
 F:EVIL | TROLL | IM_COLD | IM_POIS | HURT_LITE
 D:$He is a troll that reeks of brine, close relative to water trolls.
@@ -9556,7 +9556,7 @@ B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
 B:TOUCH:ACID:1d10
 F:FORCE_SLEEP | 
-F:EMPTY_MIND | COLD_BLOOD | WILD_TOO | WILD_SHORE | WILD_SWAMP |
+F:EMPTY_MIND | COLD_BLOOD | WILD_SHORE | WILD_SWAMP |
 F:KILL_ITEM | KILL_BODY | BASH_DOOR |
 F:EVIL | IM_ACID | IM_FIRE | CAN_SWIM | NONLIVING |
 F:IM_COLD | IM_ELEC | IM_POIS | 
@@ -9575,7 +9575,7 @@ W:35:1:0:620:4000:592
 B:CLAW:HURT:1d5
 B:CLAW:HURT:1d5
 B:BITE:HURT:1d6
-F:FORCE_SLEEP | FORCE_MAXHP | WILD_TOO | WILD_SWAMP |
+F:FORCE_SLEEP | FORCE_MAXHP | WILD_SWAMP |
 F:DROP_60 | DROP_90 | DROP_1D2 | DROP_CORPSE
 F:OPEN_DOOR | BASH_DOOR | CAN_FLY | 
 F:EVIL | DRAGON | IM_ACID | RIDING
@@ -9625,7 +9625,7 @@ B:CLAW:HURT:1d8
 B:CLAW:HURT:1d8
 B:BITE:HURT:2d8
 F:FORCE_SLEEP | FORCE_MAXHP | DROP_2D2 | DROP_CORPSE
-F:OPEN_DOOR | BASH_DOOR | CAN_FLY | WILD_TOO | WILD_WASTE | WILD_MOUNTAIN | 
+F:OPEN_DOOR | BASH_DOOR | CAN_FLY | WILD_WASTE | WILD_MOUNTAIN | 
 F:EVIL | DRAGON | IM_COLD | NO_CONF | NO_SLEEP | RIDING
 S:1_IN_10 |
 S:SCARE |
@@ -9684,7 +9684,7 @@ B:CRUSH:HURT:4d8
 B:CRUSH:HURT:4d8
 B:CRUSH:HURT:4d8
 B:BITE:EXP_40:3d9
-F:FORCE_MAXHP | OPEN_DOOR | DROP_60 | WILD_TOO | WILD_SWAMP |
+F:FORCE_MAXHP | OPEN_DOOR | DROP_60 | WILD_SWAMP |
 F:SMART | BASH_DOOR | 
 F:EVIL | GIANT | IM_POIS | CAN_FLY 
 D:$"Two eyes, the colour of a thin, yellow wine, were set high in the 
@@ -9835,7 +9835,7 @@ B:CLAW:HURT:1d8
 B:BITE:HURT:2d8
 F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
 F:DROP_60 | DROP_90 | DROP_2D2 | DROP_CORPSE | RIDING
-F:OPEN_DOOR | BASH_DOOR | WILD_TOO | WILD_MOUNTAIN |
+F:OPEN_DOOR | BASH_DOOR | WILD_MOUNTAIN |
 F:DRAGON
 S:1_IN_11 | 
 S:SCARE | 
@@ -9856,7 +9856,7 @@ B:CLAW:HURT:1d8
 B:BITE:HURT:2d10
 F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
 F:DROP_60 | DROP_90 | DROP_2D2 | DROP_CORPSE | RIDING
-F:BASH_DOOR | WILD_TOO | WILD_MOUNTAIN | WILD_WOOD |
+F:BASH_DOOR | WILD_MOUNTAIN | WILD_WOOD |
 F:EVIL | DRAGON | IM_ELEC | NO_CONF | NO_SLEEP | SELF_LITE_1
 S:1_IN_9 | 
 S:SCARE | 
@@ -9875,7 +9875,7 @@ B:CLAW:HURT:1d4
 B:BITE:HURT:1d6
 F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
 F:DROP_60 | DROP_90 | DROP_2D2 | DROP_CORPSE
-F:BASH_DOOR | WILD_TOO | WILD_MOUNTAIN | WILD_WOOD |
+F:BASH_DOOR | WILD_MOUNTAIN | WILD_WOOD |
 F:EVIL | DRAGON | IM_POIS | NO_CONF | NO_SLEEP | RIDING
 S:1_IN_9 | 
 S:SCARE | 
@@ -9892,7 +9892,7 @@ W:36:2:0:1300:10000:602
 B:CLAW:HURT:1d8
 B:CLAW:HURT:1d8
 B:BITE:HURT:2d10
-F:FORCE_SLEEP | FORCE_MAXHP | WILD_TOO | WILD_MOUNTAIN |
+F:FORCE_SLEEP | FORCE_MAXHP | WILD_MOUNTAIN |
 F:DROP_1D2 | DROP_4D2 | CAN_FLY |
 F:BASH_DOOR | DROP_CORPSE | RIDING
 F:DRAGON | NO_CONF | NO_SLEEP
@@ -9912,7 +9912,7 @@ B:CLAW:HURT:1d8
 B:CLAW:HURT:1d8
 B:BITE:HURT:2d8
 F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
-F:DROP_60 | DROP_90 | DROP_1D2 | WILD_TOO | WILD_MOUNTAIN | WILD_VOLCANO |
+F:DROP_60 | DROP_90 | DROP_1D2 | WILD_MOUNTAIN | WILD_VOLCANO |
 F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | RIDING
 F:EVIL | DRAGON | IM_FIRE | SELF_LITE_1 |
 S:1_IN_11 | 
@@ -10315,7 +10315,7 @@ B:HIT:HURT:1d9
 B:HIT:HURT:1d9
 F:FORCE_SLEEP | FORCE_MAXHP | RAND_50 | SELF_LITE_1 |
 F:SMART | EMPTY_MIND | INVISIBLE | 
-F:PASS_WALL | POWERFUL | CAN_FLY | WILD_TOO | WILD_SWAMP |
+F:PASS_WALL | POWERFUL | CAN_FLY | WILD_SWAMP |
 F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
 F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING
 S:1_IN_2 | 
@@ -10365,7 +10365,7 @@ B:HIT:FIRE:3d7
 B:HIT:HURT:4d6
 B:HIT:FIRE:3d7
 F:FORCE_SLEEP |
-F:EMPTY_MIND | AURA_FIRE | WILD_TOO | WILD_VOLCANO |
+F:EMPTY_MIND | AURA_FIRE | WILD_VOLCANO |
 F:KILL_ITEM | KILL_BODY | PASS_WALL |
 F:EVIL | IM_FIRE | IM_ELEC | NONLIVING |
 F:IM_POIS | 
@@ -10453,7 +10453,7 @@ W:37:1:0:1400:10000:644
 B:CLAW:HURT:1d4
 B:CLAW:HURT:1d10
 B:BITE:HURT:2d12
-F:FORCE_SLEEP | FORCE_MAXHP | WILD_TOO | WILD_MOUNTAIN | WILD_VOLCANO |
+F:FORCE_SLEEP | FORCE_MAXHP | WILD_MOUNTAIN | WILD_VOLCANO |
 F:DROP_1D2 | DROP_4D2 | CAN_FLY | DROP_CORPSE | RIDING
 F:BASH_DOOR | SELF_LITE_1 |
 F:EVIL | DRAGON | IM_FIRE | NO_CONF | NO_SLEEP
@@ -10472,7 +10472,7 @@ W:37:2:0:1500:12000:645
 B:CLAW:HURT:1d4
 B:CLAW:HURT:1d10
 B:BITE:HURT:2d12
-F:FORCE_SLEEP | FORCE_MAXHP | WILD_TOO | WILD_MOUNTAIN |
+F:FORCE_SLEEP | FORCE_MAXHP | WILD_MOUNTAIN |
 F:DROP_1D2 | DROP_4D2 | CAN_FLY | DROP_CORPSE | RIDING
 F:BASH_DOOR | 
 F:DRAGON | NO_CONF | NO_SLEEP
@@ -10513,7 +10513,7 @@ B:CLAW:HURT:1d8
 B:CLAW:HURT:1d8
 B:BITE:HURT:2d10
 F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | DROP_CORPSE
-F:DROP_60 | DROP_90 | DROP_2D2 | WILD_TOO | WILD_SWAMP | WILD_MOUNTAIN |
+F:DROP_60 | DROP_90 | DROP_2D2 | WILD_SWAMP | WILD_MOUNTAIN |
 F:BASH_DOOR | 
 F:EVIL | DRAGON | IM_ACID | NO_CONF | NO_SLEEP | RIDING
 S:1_IN_9 | 
@@ -10922,7 +10922,7 @@ B:BITE:POISON:10d3
 B:BITE:POISON:10d3
 F:FORCE_SLEEP | UNIQUE | CAN_SWIM | FORCE_MAXHP |
 F:ONLY_GOLD | DROP_2D2 | DROP_4D2 | ESCORT | DROP_CORPSE
-F:BASH_DOOR | MOVE_BODY | EVIL | WILD_TOO | WILD_SHORE |
+F:BASH_DOOR | MOVE_BODY | EVIL | WILD_SHORE |
 F:ANIMAL | IM_POIS | RIDING
 S:1_IN_5 | 
 S:BR_POIS | BR_FIRE | SCARE | CONF
@@ -11006,7 +11006,7 @@ B:BITE:POISON:3d9
 B:BITE:POISON:3d9
 B:BITE:POISON:3d9
 B:SPIT:BLIND:1d2
-F:FORCE_SLEEP | WILD_TOO | WILD_SHORE | WILD_SWAMP |
+F:FORCE_SLEEP | WILD_SHORE | WILD_SWAMP |
 F:ONLY_GOLD | DROP_2D2 | DROP_4D2 | CAN_SWIM | DROP_CORPSE
 F:BASH_DOOR | MOVE_BODY | 
 F:ANIMAL | IM_POIS | RIDING
@@ -11037,7 +11037,7 @@ F:UNIQUE | FEMALE | DROP_1D2 | DROP_2D2 | ONLY_ITEM | DROP_GOOD |
 F:FORCE_SLEEP | FORCE_MAXHP | RAND_25 | DROP_CORPSE |
 F:CAN_SPEAK | CAN_SWIM | WILD_OCEAN |
 F:KILL_ITEM | KILL_BODY | BASH_DOOR | POWERFUL |
-F:EVIL | IM_POIS | WILD_TOO | WILD_SHORE | WILD_SWAMP |
+F:EVIL | IM_POIS | WILD_SHORE | WILD_SWAMP |
 F:NO_CONF | NO_SLEEP | NO_FEAR
 S:1_IN_4 |
 S:BO_ICEE | BO_WATE | BA_COLD | BA_WATE
@@ -11197,7 +11197,7 @@ B:HIT:HURT:3d6
 B:BITE:HURT:3d4
 B:BITE:HURT:3d4
 F:FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_1D2 | WILD_TOO | WILD_MOUNTAIN | WILD_WOOD | WILD_SWAMP |
+F:ONLY_ITEM | DROP_1D2 | WILD_MOUNTAIN | WILD_WOOD | WILD_SWAMP |
 F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | REGENERATE |
 F:EVIL | TROLL | IM_POIS | NO_CONF | NO_SLEEP
 D:$A massive troll of huge strength.  Ettins are stupid but violent.
@@ -11455,7 +11455,7 @@ B:BITE:FIRE:3d6
 B:BITE:FIRE:3d6
 B:BITE:FIRE:3d6
 B:BITE:FIRE:3d6
-F:FORCE_SLEEP | WILD_TOO | WILD_SHORE | WILD_SWAMP |
+F:FORCE_SLEEP | WILD_SHORE | WILD_SWAMP |
 F:ONLY_GOLD | DROP_2D2 | DROP_4D2 | CAN_SWIM |
 F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | DROP_CORPSE
 F:ANIMAL | IM_FIRE | RIDING
@@ -12787,7 +12787,7 @@ B:BITE:FIRE:3d12
 B:BITE:FIRE:3d12
 B:BITE:FIRE:3d12
 B:BITE:FIRE:3d12
-F:FORCE_SLEEP | WILD_TOO | WILD_SHORE | WILD_SWAMP |
+F:FORCE_SLEEP | WILD_SHORE | WILD_SWAMP |
 F:ONLY_GOLD | DROP_2D2 | DROP_4D2 | DROP_CORPSE
 F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | 
 F:ANIMAL | IM_FIRE | CAN_SWIM | RIDING
@@ -13167,7 +13167,7 @@ B:BITE:HURT:5d8
 B:BITE:HURT:5d8
 B:CRUSH:POISON:3d10
 B:CRUSH:POISON:3d10
-F:FORCE_SLEEP | FORCE_MAXHP | RES_TELE | AQUATIC | WILD_TOO | WILD_OCEAN |
+F:FORCE_SLEEP | FORCE_MAXHP | RES_TELE | AQUATIC | WILD_OCEAN |
 F:IM_FIRE | IM_ACID | IM_COLD | IM_POIS |
 F:DRAGON | NO_CONF | NO_SLEEP | NO_FEAR | RIDING
 S:1_IN_6 | 
@@ -14085,7 +14085,7 @@ B:CRUSH:HURT:16d12
 B:CRUSH:HURT:16d12
 B:CRUSH:HURT:16d12
 B:CRUSH:HURT:16d12
-F:FORCE_SLEEP | FORCE_MAXHP | AQUATIC | WILD_TOO | WILD_OCEAN |
+F:FORCE_SLEEP | FORCE_MAXHP | AQUATIC | WILD_OCEAN |
 F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
 F:BASH_DOOR | POWERFUL | MOVE_BODY | SMART | RES_WATE |
 F:EVIL | IM_ELEC | NO_CONF | NO_SLEEP | IM_POIS | IM_FIRE | RIDING
@@ -14419,7 +14419,7 @@ B:BITE:FIRE:12d6
 B:BITE:FIRE:12d6
 F:UNIQUE | 
 F:FORCE_SLEEP | FORCE_MAXHP | SMART | DROP_CORPSE | RIDING |
-F:ONLY_GOLD | DROP_3D2 | DROP_4D2 | WILD_TOO | WILD_SHORE | WILD_SWAMP |
+F:ONLY_GOLD | DROP_3D2 | DROP_4D2 | WILD_SHORE | WILD_SWAMP |
 F:OPEN_DOOR | BASH_DOOR | KILL_BODY | POWERFUL | 
 F:ANIMAL | IM_FIRE | IM_POIS | 
 F:NO_CONF | NO_SLEEP | CAN_SWIM |
@@ -15043,7 +15043,7 @@ B:CRUSH:HURT:15d15
 B:CRUSH:HURT:15d15
 B:CRUSH:HURT:15d15
 B:CRUSH:HURT:15d15
-F:FORCE_SLEEP | FORCE_MAXHP | AQUATIC | WILD_TOO | WILD_OCEAN |
+F:FORCE_SLEEP | FORCE_MAXHP | AQUATIC | WILD_OCEAN |
 F:ONLY_ITEM | DROP_3D2 | DROP_GOOD | 
 F:BASH_DOOR | POWERFUL | MOVE_BODY | SMART | RES_WATE |
 F:EVIL | IM_ELEC | NO_CONF | NO_SLEEP | IM_POIS | IM_FIRE | RIDING
@@ -15209,7 +15209,7 @@ B:BITE:FIRE:5d12
 B:BITE:FIRE:5d12
 B:CRUSH:HURT:6d15
 B:CRUSH:HURT:6d15
-F:FORCE_SLEEP | FORCE_MAXHP | AQUATIC | WILD_TOO | WILD_OCEAN |
+F:FORCE_SLEEP | FORCE_MAXHP | AQUATIC | WILD_OCEAN |
 F:IM_FIRE | IM_ACID | IM_COLD | IM_POIS
 F:DRAGON | NO_CONF | NO_SLEEP | NO_FEAR | DROP_CORPSE | RIDING
 S:1_IN_9
@@ -17334,7 +17334,7 @@ W:75:1:0:30000:0:0
 B:CRUSH:SUPERHURT:20d10
 B:CRUSH:SUPERHURT:20d10
 B:BITE:HURT:5d50
-F:UNIQUE | FORCE_MAXHP | FORCE_SLEEP | AQUATIC | WILD_TOO | WILD_OCEAN |
+F:UNIQUE | FORCE_MAXHP | FORCE_SLEEP | AQUATIC | WILD_OCEAN |
 F:MOVE_BODY | KILL_WALL | IM_FIRE | IM_POIS | IM_ACID | IM_COLD | EVIL |
 F:RES_WATE | RES_PLAS | RES_NEXU | NO_STUN | REGENERATE | DROP_CORPSE
 F:NO_CONF | NO_SLEEP | RIDING | POWERFUL
@@ -18358,7 +18358,7 @@ B:HIT:FIRE:1d6
 B:BITE:FIRE:3d4
 F:MALE | FRIENDS | DROP_60 | DROP_SKELETON | DROP_CORPSE | SELF_LITE_1 |
 F:OPEN_DOOR | BASH_DOOR | EVIL | TROLL | HURT_LITE | REGENERATE |
-F:HURT_COLD | IM_FIRE | WILD_VOLCANO | WILD_TOO
+F:HURT_COLD | IM_FIRE | WILD_VOLCANO
 D:Fire trolls are believed to have been created by an
 D:evil wizard trying to make forest trolls immune to
 D:fire.
@@ -18471,7 +18471,7 @@ W:21:2:0:100:800:415
 B:HIT:SUPERHURT:4d8
 B:HIT:SUPERHURT:4d8
 F:RAND_25 | DROP_90 | OPEN_DOOR | BASH_DOOR | DROP_CORPSE | EVIL | MOVE_BODY
-F:WILD_TOO | WILD_WASTE
+F:WILD_WASTE
 D:It is a massive ogre in metal armour, a champion of its kind.
 
 N:908:À¸¤­¤¿¥Ý¡¼¥ë¡¦¥¢¥Ã¥¯¥¹
@@ -18827,7 +18827,7 @@ F:IM_ACID | IM_ELEC | IM_FIRE | IM_COLD | IM_POIS |
 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 |
-F:WILD_GRASS | WILD_TOO | SELF_LITE_1 | SELF_LITE_2 |
+F:WILD_GRASS | WILD_ALL | SELF_LITE_1 | SELF_LITE_2 |
 S:1_IN_3 |
 S:SHRIEK | DISPEL | ROCKET | ARROW_1 | ARROW_2 | ARROW_3 | ARROW_4 | BR_ACID |
 S:BR_ELEC | BR_FIRE | BR_COLD | BR_POIS | BR_NETH | BR_LITE | BR_DARK | BR_CONF |
@@ -19295,7 +19295,7 @@ I:110:11d8:20:30:30
 W:5:1:0:25:70:957
 B:BITE:HURT:1d8
 B:KICK:HURT:2d4
-F:WILD_TOO | WILD_WASTE | BASH_DOOR |
+F:WILD_WASTE | BASH_DOOR |
 F:ANIMAL | DROP_SKELETON | DROP_CORPSE | RIDING
 
 N:957:¤¢¤Ð¤ìÇÏ
@@ -19306,7 +19306,7 @@ W:9:2:0:35:0:0
 B:BITE:HURT:1d8
 B:KICK:HURT:2d4
 B:KICK:HURT:2d4
-F:WILD_TOO | WILD_WASTE | BASH_DOOR | RAND_25 |
+F:WILD_WASTE | BASH_DOOR | RAND_25 |
 F:ANIMAL | DROP_SKELETON | DROP_CORPSE | RIDING
 
 N:958:À֤פè
@@ -19363,7 +19363,7 @@ B:TOUCH:POISON:2d5
 F:SMART | COLD_BLOOD | 
 F:WEIRD_MIND | MULTIPLY | REGENERATE |
 F:MOVE_BODY | ANIMAL | GOOD | NONLIVING | 
-F:RES_TELE | CAN_SWIM | WILD_TOO | WILD_SWAMP
+F:RES_TELE | CAN_SWIM | WILD_SWAMP
 S:1_IN_10 |
 S:SHRIEK | MIND_BLAST
 D:$It`s a slime colony.
@@ -19735,7 +19735,7 @@ W:14:10:0:30:400:343
 B:CLAW:HURT:1d7
 B:CLAW:HURT:1d7
 B:BITE:HURT:2d7
-F:OPEN_DOOR | BASH_DOOR | WILD_TOO | WILD_MOUNTAIN | DROP_CORPSE |
+F:OPEN_DOOR | BASH_DOOR | WILD_MOUNTAIN | DROP_CORPSE |
 F:ANIMAL
 D:¹­Å縩¤ÎÈæÇÌ»³°ìÂӤ˸½¤ì¤ë¡Ö¥µ¥ë¤Ë»÷¤Æ¤¤¤ë¤¬¡¢¥µ¥ë¤è¤ê¤âÂ礭¤Ê¡×Ææ¤Îưʪ¡£
 
@@ -19748,7 +19748,7 @@ B:CLAW:HURT:1d10
 B:CLAW:HURT:1d10
 B:BITE:POISON:1d10
 F:FORCE_SLEEP | DROP_CORPSE | ANIMAL |
-F:BASH_DOOR | WILD_TOO | WILD_MOUNTAIN |
+F:BASH_DOOR | WILD_MOUNTAIN |
 D:Ƭ¤¬¥µ¥ë¡¢Æ¹¤Ï¥¿¥Ì¥­¡¢Èø¤Ï¥Ø¥Ó¡¢¼ê­¤Ï¥È¥é¤Ç¡¢ÌĤ­À¼¤Ï¥È¥é¥Ä¥°¥ß¤Ë
 D:»÷¤Æ¤¤¤¿¤È¤¤¤¦´ñ̯¤ÊÀ¸Êª¤À¡£¤Ò¤¸¤ç¤¦¤ËÊѤï¤Ã¤¿
 D:³°¸«¤ò¤·¤Æ¤¤¤Æ¡¢¶á´ó¤ê¤¬¤¿¤¤Ê·°Ïµ¤¤¬¤¢¤ë¡£
@@ -19864,7 +19864,7 @@ B:CLAW:HURT:7d10
 B:CLAW:HURT:7d10
 B:BITE:POISON:5d10
 B:BITE:POISON:5d10
-F:UNIQUE | MALE | CAN_SPEAK | DROP_CORPSE | WILD_TOO | WILD_WOOD |
+F:UNIQUE | MALE | CAN_SPEAK | DROP_CORPSE | WILD_WOOD |
 F:FORCE_SLEEP | FORCE_MAXHP | RAND_25 | GOOD | FRIENDLY | 
 F:SMART | OPEN_DOOR | BASH_DOOR | MOVE_BODY | RIDING |
 F:ANIMAL | IM_FIRE | IM_POIS | NO_CONF | NO_SLEEP
@@ -20349,7 +20349,7 @@ W:5:4:0:20:0:0
 B:HIT:HURT:3d4
 B:HIT:EAT_FOOD:3d4
 F:DROP_60 | OPEN_DOOR | BASH_DOOR | DROP_CORPSE |
-F:WILD_TOO | WILD_WOOD
+F:WILD_WOOD
 D:$It is a biped living thing like the bear. 
 D:$It pounces on you expressionlessly.
 D:̵ɽ¾ð¤Ç½±¤¤¤«¤«¤ë¡¢Æó­Êâ¹Ô¤Î·§¤Î¤è¤¦¤ÊÀ¸¤­Êª¤À¡£
@@ -20368,7 +20368,7 @@ B:HIT:EAT_GOLD:1d9
 B:TOUCH:EAT_ITEM
 B:TOUCH:EAT_ITEM
 F:UNIQUE | FEMALE | FORCE_SLEEP | FORCE_MAXHP | CAN_SPEAK | FRIENDLY |
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | DROP_GREAT | WILD_TOO | WILD_GRASS |
+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
 S:HEAL | TRAPS
@@ -20533,7 +20533,7 @@ B:HIT:HURT:1d15
 B:HIT:HURT:1d15
 B:HIT:HURT:1d15
 F:UNIQUE | MALE | EVIL | HAS_LITE_2 |
-F:FORCE_MAXHP | CAN_SPEAK | WILD_TOO | DROP_SKELETON | DROP_CORPSE
+F:FORCE_MAXHP | CAN_SPEAK | WILD_ALL | DROP_SKELETON | DROP_CORPSE
 F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
 F:OPEN_DOOR | BASH_DOOR
 D:$He is a king of southerings. He was arrested by Zhuge Liang 7 times.
@@ -20940,7 +20940,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_TOO |
+F:DROP_60 | WILD_ALL |
 F:OPEN_DOOR | DROP_SKELETON | DROP_CORPSE | 
 F:HAS_LITE_1 | NO_CONF | NO_SLEEP
 S:1_IN_12 |
@@ -20954,7 +20954,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_TOO | FRIENDS | 
+F:DROP_60 | WILD_ALL | FRIENDS | 
 F:OPEN_DOOR | DROP_SKELETON | DROP_CORPSE | 
 F:HAS_LITE_1 | NO_CONF | NO_SLEEP
 S:1_IN_12 |
@@ -20970,7 +20970,7 @@ W:22:2:0:50:5000:1056
 B:HIT:HURT:3d4
 B:HIT:HURT:3d4
 F:MALE | 
-F:FORCE_SLEEP | DROP_90 | WILD_TOO | 
+F:FORCE_SLEEP | DROP_90 | WILD_ALL | 
 F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE | 
 F:EVIL | HAS_LITE_2
 S:1_IN_4 | 
@@ -21097,7 +21097,7 @@ B:HIT:HURT:6d5
 B:HIT:HURT:25d1
 B:HIT:HURT:30d1
 F:UNIQUE | MALE | WEIRD_MIND | CAN_SPEAK |
-F:FORCE_MAXHP | WILD_TOO | DROP_CORPSE
+F:FORCE_MAXHP | WILD_ALL | DROP_CORPSE
 #F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | DROP_CHOSEN |
 F:OPEN_DOOR | BASH_DOOR | 
 F:TROLL | IM_COLD | IM_POIS

diff --git a/src/birth.c b/src/birth.c
index 1bd8e90..251352b 100644 (file)
--- a/src/birth.c
+++ b/src/birth.c
@@ -5524,7 +5524,7 @@ static bool player_birth_aux(void)
 
                        if(r_ptr->flags7 & RF7_AQUATIC) continue;
 
-                       if(!(r_ptr->flags8 & RF8_DUNGEON)) continue;
+                       if(r_ptr->flags8 & RF8_WILD_ONLY) continue;
 
                        /*
                         * Accept monsters that are 2 - 6 levels

diff --git a/src/defines.h b/src/defines.h
index 4df55ae..81735e5 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -3306,7 +3306,7 @@
 /*
  * Monster race flags
  */
-#define RF8_DUNGEON             0x00000001
+#define RF8_WILD_ONLY           0x00000001
 #define RF8_WILD_TOWN           0x00000002
 #define RF8_XXX8X02             0x00000004
 #define RF8_WILD_SHORE          0x00000008
@@ -3317,7 +3317,7 @@
 #define RF8_XXX8X08             0x00000100
 #define RF8_WILD_MOUNTAIN       0x00000200
 #define RF8_WILD_GRASS          0x00000400
-#define RF8_WILD_TOO            0x80000000
+#define RF8_WILD_ALL            0x80000000
 
 /*
  * Monster drop info

diff --git a/src/externs.h b/src/externs.h
index 9cc8859..8b9c135 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -772,7 +772,6 @@ extern void create_name(int type, char *name);
 extern cptr horror_desc[MAX_SAN_HORROR];
 extern cptr funny_desc[MAX_SAN_FUNNY];
 extern cptr funny_comments[MAX_SAN_COMMENT];
-extern int get_wilderness_flag(void);
 extern void sanity_blast(monster_type *m_ptr, bool necro);
 extern void delete_monster_idx(int i);
 extern void delete_monster(int y, int x);

diff --git a/src/init1.c b/src/init1.c
index ce2fd32..f87fb35 100644 (file)
--- a/src/init1.c
+++ b/src/init1.c
@@ -447,7 +447,7 @@ static cptr r_info_flags8[] =
        "XXX8X28",
        "XXX8X29",
        "WILD_SWAMP",   /* ToDo: Implement Swamp */
-       "WILD_TOO",
+       "WILD_ALL",
 };
 
 
@@ -734,24 +734,6 @@ errr init_info_txt(FILE *fp, char *buf, header *head,
        if (head->name_size) head->name_size++;
        if (head->text_size) head->text_size++;
 
-       /* 
-        * Mega Hack -- init_r_info_txt()¤À¤±ºÇ¸å¤ËÆüì¤Ê½èÍý¤ò¤·¤Æ¤¤¤¿¡£
-        *              ¤É¤¦¤Ë¤«¤Ê¤é¤Ê¤¤¤â¤Î¤«¡£
-        */
-       if (head == &r_head)
-       {
-               int i;
-               for (i = 1; i < max_r_idx; i++)
-               {
-                       /* Invert flag WILD_ONLY <-> RF8_DUNGEON */
-                       r_info[i].flags8 ^= 1L;
-
-                       /* WILD_TOO without any other wilderness flags enables all flags */
-                       if ((r_info[i].flags8 & RF8_WILD_TOO) && !(r_info[i].flags8 & 0x7FFFFFFE))
-                               r_info[i].flags8 = 0x0463;
-               }
-       }
-
        /* Success */
        return (0);
 }

diff --git a/src/load.c b/src/load.c
index 8a83394..9eee7d0 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -2543,7 +2543,7 @@ note(format("
 
                                                        if(r_ptr->flags7 & RF7_AQUATIC) continue;
 
-                                                       if(!(r_ptr->flags8 & RF8_DUNGEON)) continue;
+                                                       if(r_ptr->flags8 & RF8_WILD_ONLY) continue;
 
                                                        /*
                                                         * Accept monsters that are 2 - 6 levels

diff --git a/src/monster1.c b/src/monster1.c
index db98747..b5ae2ce 100644 (file)
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -3204,7 +3204,7 @@ bool monster_quest(int r_idx)
        monster_race *r_ptr = &r_info[r_idx];
 
        /* Random quests are in the dungeon */
-       if (!(r_ptr->flags8 & RF8_DUNGEON)) return FALSE;
+       if (r_ptr->flags8 & RF8_WILD_ONLY) return FALSE;
 
        /* No random quests for aquatic monsters */
        if (r_ptr->flags7 & RF7_AQUATIC) return FALSE;
@@ -3223,7 +3223,7 @@ bool monster_dungeon(int r_idx)
 {
        monster_race *r_ptr = &r_info[r_idx];
 
-       if (r_ptr->flags8 & RF8_DUNGEON)
+       if (!(r_ptr->flags8 & RF8_WILD_ONLY))
                return TRUE;
        else
                return FALSE;
@@ -3256,7 +3256,7 @@ bool monster_waste(int r_idx)
 {
        monster_race *r_ptr = &r_info[r_idx];
 
-       if (r_ptr->flags8 & RF8_WILD_WASTE)
+       if (r_ptr->flags8 & (RF8_WILD_WASTE | RF8_WILD_ALL))
                return TRUE;
        else
                return FALSE;
@@ -3267,7 +3267,7 @@ bool monster_town(int r_idx)
 {
        monster_race *r_ptr = &r_info[r_idx];
 
-       if (r_ptr->flags8 & RF8_WILD_TOWN)
+       if (r_ptr->flags8 & (RF8_WILD_TOWN | RF8_WILD_ALL))
                return TRUE;
        else
                return FALSE;
@@ -3278,7 +3278,7 @@ bool monster_wood(int r_idx)
 {
        monster_race *r_ptr = &r_info[r_idx];
 
-       if (r_ptr->flags8 & RF8_WILD_WOOD)
+       if (r_ptr->flags8 & (RF8_WILD_WOOD | RF8_WILD_ALL))
                return TRUE;
        else
                return FALSE;
@@ -3311,7 +3311,7 @@ bool monster_grass(int r_idx)
 {
        monster_race *r_ptr = &r_info[r_idx];
 
-       if (r_ptr->flags8 & RF8_WILD_GRASS)
+       if (r_ptr->flags8 & (RF8_WILD_GRASS | RF8_WILD_ALL))
                return TRUE;
        else
                return FALSE;
@@ -3525,7 +3525,8 @@ bool are_enemies(monster_type *m_ptr, monster_type *n_ptr)
                return TRUE;
        }
 
-       if ((r_ptr->flags8 & RF8_WILD_TOWN) && (s_ptr->flags8 & RF8_WILD_TOWN))
+       if ((r_ptr->flags8 & (RF8_WILD_TOWN | RF8_WILD_ALL))
+           && (s_ptr->flags8 & (RF8_WILD_TOWN | RF8_WILD_ALL)))
        {
                if (!is_pet(m_ptr) && !is_pet(n_ptr)) return FALSE;
        }

diff --git a/src/monster2.c b/src/monster2.c
index 9695883..faefdb6 100644 (file)
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -152,18 +152,6 @@ cptr funny_comments[MAX_SAN_COMMENT] =
 };
 
 
-int get_wilderness_flag(void)
-{
-       int x = p_ptr->wilderness_x;
-       int y = p_ptr->wilderness_y;
-
-       if (dun_level)
-               return (RF8_DUNGEON);
-       else
-               return (1L << wilderness[y][x].terrain);
-}
-
-
 /*
  * Delete a monster by index.
  *

diff --git a/src/xtra2.c b/src/xtra2.c
index 61349b3..59a1f67 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -1641,7 +1641,7 @@ static void get_exp_from_mon(int dam, monster_type *m_ptr)
 
                  div *= r_ptr->hdice * (r_ptr->hside + 1);
                }
-               if (!dun_level && ((r_ptr->flags8 & RF8_DUNGEON) || !(r_ptr->flags1 & RF1_UNIQUE))) div *= 5;
+               if (!dun_level && (!(r_ptr->flags8 & RF8_WILD_ONLY) || !(r_ptr->flags1 & RF1_UNIQUE))) div *= 5;
                div_h = div/0x10000L;
                div_l = div%0x10000L;
                div_h *= (m_ptr->max_maxhp*2);