モンスターを１件追加。闘技場を修正。

diff --git a/lib/edit/misc.txt b/lib/edit/misc.txt
index 5ccb896..ced7ea4 100644 (file)
--- a/lib/edit/misc.txt
+++ b/lib/edit/misc.txt
@@ -13,7 +13,7 @@ M:WX:99
 M:WY:66
 
 # Maximum number of monsters in r_info.txt
-M:R:1083
+M:R:1084
 
 # Maximum number of items in k_info.txt
 M:K:667

diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt
index e56a20a..161fddb 100644 (file)
--- a/lib/edit/r_info.txt
+++ b/lib/edit/r_info.txt
@@ -478,9 +478,9 @@ N:19:
 E:Lion Heart
 G:f:s
 I:111:20d20:50:15:4
-W:0:4:0:0:0:0
+W:0:255:0:0:0:0
 B:HIT:HURT:1d3
-F:UNIQUE | MALE | ANIMAL | CAN_SPEAK | FRIENDLY
+F:UNIQUE | MALE | ANIMAL | CAN_SPEAK
 F:FORCE_MAXHP | DROP_CORPSE | WILD_TOWN | WILD_ONLY
 F:ONLY_ITEM | DROP_90 | DROP_GOOD | HUMAN |
 F:OPEN_DOOR | BASH_DOOR | HAS_LITE_1 |
@@ -21706,4 +21706,16 @@ S:1_IN_6
 S:SHOOT
 D:ÈàÅù¤ÎʸÌÀ¤ÏÃϵå¤è¤ê£µ£°£°Ç¯¿Ê¤ó¤Ç¤¤¤ë¤½¤¦¤À¡£
 D:¡Ö¤³¤ì¤«¤éËèÆü²È¤ò¾Æ¤³¤¦¤¼¡×
-D:¡Ê¡Ø¥Á¥ã¡¼¥¸¥Þ¥ó¸¦¡ª¡Ù¥¢¥Ë¥áÂ裲£µÏᦡØͺ°ì¾¯Ç¯¤òµß¤¨¡ª¡Ù¡Ë
\ No newline at end of file
+D:¡Ê¡Ø¥Á¥ã¡¼¥¸¥Þ¥ó¸¦¡ª¡Ù¥¢¥Ë¥áÂ裲£µÏᦡØͺ°ì¾¯Ç¯¤òµß¤¨¡ª¡Ù¡Ë
+
+N:1083:È·¡Ø¥Ý¥Ã¥Ý¡Ù
+E:Hato Poppo
+G:B:v
+I:111:20d20:50:15:4
+W:0:4:0:0:0:0
+B:HIT:HURT:1d3
+F:ATTR_MULTI | UNIQUE | MALE | ANIMAL | CAN_SPEAK | FRIENDLY
+F:FORCE_MAXHP | DROP_CORPSE | WILD_TOWN | WILD_ONLY
+F:ONLY_ITEM | DROP_90 | DROP_GOOD | HUMAN |
+F:OPEN_DOOR | BASH_DOOR | HAS_LITE_1 |
+F:NO_CONF | NO_SLEEP

diff --git a/lib/file/monfrien_j.txt b/lib/file/monfrien_j.txt
index f9620ea..c2c83b0 100644 (file)
--- a/lib/file/monfrien_j.txt
+++ b/lib/file/monfrien_j.txt
@@ -86,6 +86,21 @@ N:1060:Mori troll
 ¡Ö½ÅÌý¤Ï¶å½£¤ÎÊý¤Ëή¤ì¤Æ¤¤¤Ã¤Æ¤¯¤ì¤ì¤Ð¤¤¤¤¡£¡×
 ¡Ö¤Õ¡¼¤¢¡¼¤æ¡¼¡©¡×
 
+N:1083:Hato Poppo
+¡Ö¥È¥é¥¹¥È¡¦¥ß¡¼¡£¡×
+¡ÖÈ·»³Æâ³Õ¤¬¼è¤êÁȤà¤Î¤Ï¡Ø̵·ì¤ÎÊ¿À®°Ý¿·¡Ù¤À¡£¡×
+¡Öɬ¤º¤·¤âÍÞ»ßÎϤȤ·¤Æ²­Æì¤Ë¸ºß¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤Íýͳ¤Ë¤Ï¤Ê¤é¤Ê¤¤¤È»×¤Ã¤Æ¤Þ¤·¤¿¡£¡×
+¡Ö¹ñ¤È¤¤¤¦¤â¤Î¤¬¤è¤¯Ê¬¤«¤é¤Ê¤¤¤Î¤Ç¤¹¤¬¡£¡×
+¡Ö¿Í´Ö¤¬¤¤¤Ê¤¯¤Ê¤ë¤Î¤¬°ìÈÖÃϵå¤Ë¤È¤Ã¤ÆÍ¥¤·¤¤¡£¡×
+¡ÖÆüËÜÎóÅç¤ÏÆüËܿͤÀ¤±¤Î½êͭʪ¤¸¤ã¤Ê¤¤¤ó¤Ç¤¹¤«¤é¡£¡×
+¡ÖÀ¯¼£²È¤¬Çϼ¯¼Ô¤Ç¤¢¤ê¡¢¤½¤Î¥È¥Ã¥×¤ÎÁíÍýÂç¿Ã¤¬ÂçÇϼ¯¼Ô¤Ç¤¢¤ë¡£¤½¤ó¤Ê¹ñ¤¬À¤³¦Åª¤Ë¤âǧ¤á¤é¤ì¤ë¤Ï¤º¤¬¤Ê¤¤¡£¡×
+¡Öº£Æü¤ÏÂçÊѤ¤¤¤Å·µ¤¤Ç¤¹¡£¡×
+¡Öͧ°¦Àº¿À¤Ë´ð¤Å¤¤¤¿¡Ø¿Í´Ö¤Î¤¿¤á¤Î·ÐºÑ¡Ù¤¬ÆüËܤο·¤¿¤ÊÀ®Ä¹¤ò¤Ä¤¯¤ë¡£¡×
+¡ÖÀµÄ¾¡¢À¯¸¢¸òÂ夹¤ëÁ°¤ÎÊý¤¬³Ú¤À¤Ã¤¿¡£Ì¾Á°¤Ë¤Ï¡Ø»³¡Ù¤¬¤Ä¤¯¤¬¡¢Ã«¤Ð¤«¤ê¤À¡£¡×
+¡Ö¸øÌó¤È¤¤¤¦¤Î¤ÏÁªµó¤Î»þ¤ÎÅޤιͤ¨Êý¤È¤¤¤¦¤³¤È¡£¡×
+¡ÖÂçÊѤʤ³¤È¤Ë¤Ê¤Ã¤¿¡¢Í½ÁÛ¤·¤Æ¤Ê¤«¤Ã¤¿¡£º¤¤Ã¤¿¤Ê¤¢¡£¡×
+¡Ö·Ã¤Þ¤ì¤¿²ÈÄí¤Ë°é¤Ã¤¿¤â¤Î¤Ç¤¹¤«¤é¡£¡×
+
 N:53:Grip, Farmer Maggot's dog
 N:54:Wolf, Farmer Maggot's dog
 N:55:Fang, Farmer Maggot's dog

diff --git a/lib/file/monspeak_j.txt b/lib/file/monspeak_j.txt
index 6ed9750..91297b1 100644 (file)
--- a/lib/file/monspeak_j.txt
+++ b/lib/file/monspeak_j.txt
@@ -103,6 +103,21 @@ N:1060:Mori troll
 ¡Ö½ÅÌý¤Ï¶å½£¤ÎÊý¤Ëή¤ì¤Æ¤¤¤Ã¤Æ¤¯¤ì¤ì¤Ð¤¤¤¤¡£¡×
 ¡Ö¤Õ¡¼¤¢¡¼¤æ¡¼¡©¡×
 
+N:1083:Hato Poppo
+¡Ö¥È¥é¥¹¥È¡¦¥ß¡¼¡£¡×
+¡ÖÈ·»³Æâ³Õ¤¬¼è¤êÁȤà¤Î¤Ï¡Ø̵·ì¤ÎÊ¿À®°Ý¿·¡Ù¤À¡£¡×
+¡Öɬ¤º¤·¤âÍÞ»ßÎϤȤ·¤Æ²­Æì¤Ë¸ºß¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤Íýͳ¤Ë¤Ï¤Ê¤é¤Ê¤¤¤È»×¤Ã¤Æ¤Þ¤·¤¿¡£¡×
+¡Ö¹ñ¤È¤¤¤¦¤â¤Î¤¬¤è¤¯Ê¬¤«¤é¤Ê¤¤¤Î¤Ç¤¹¤¬¡£¡×
+¡Ö¿Í´Ö¤¬¤¤¤Ê¤¯¤Ê¤ë¤Î¤¬°ìÈÖÃϵå¤Ë¤È¤Ã¤ÆÍ¥¤·¤¤¡£¡×
+¡ÖÆüËÜÎóÅç¤ÏÆüËܿͤÀ¤±¤Î½êͭʪ¤¸¤ã¤Ê¤¤¤ó¤Ç¤¹¤«¤é¡£¡×
+¡ÖÀ¯¼£²È¤¬Çϼ¯¼Ô¤Ç¤¢¤ê¡¢¤½¤Î¥È¥Ã¥×¤ÎÁíÍýÂç¿Ã¤¬ÂçÇϼ¯¼Ô¤Ç¤¢¤ë¡£¤½¤ó¤Ê¹ñ¤¬À¤³¦Åª¤Ë¤âǧ¤á¤é¤ì¤ë¤Ï¤º¤¬¤Ê¤¤¡£¡×
+¡Öº£Æü¤ÏÂçÊѤ¤¤¤Å·µ¤¤Ç¤¹¡£¡×
+¡Öͧ°¦Àº¿À¤Ë´ð¤Å¤¤¤¿¡Ø¿Í´Ö¤Î¤¿¤á¤Î·ÐºÑ¡Ù¤¬ÆüËܤο·¤¿¤ÊÀ®Ä¹¤ò¤Ä¤¯¤ë¡£¡×
+¡ÖÀµÄ¾¡¢À¯¸¢¸òÂ夹¤ëÁ°¤ÎÊý¤¬³Ú¤À¤Ã¤¿¡£Ì¾Á°¤Ë¤Ï¡Ø»³¡Ù¤¬¤Ä¤¯¤¬¡¢Ã«¤Ð¤«¤ê¤À¡£¡×
+¡Ö¸øÌó¤È¤¤¤¦¤Î¤ÏÁªµó¤Î»þ¤ÎÅޤιͤ¨Êý¤È¤¤¤¦¤³¤È¡£¡×
+¡ÖÂçÊѤʤ³¤È¤Ë¤Ê¤Ã¤¿¡¢Í½ÁÛ¤·¤Æ¤Ê¤«¤Ã¤¿¡£º¤¤Ã¤¿¤Ê¤¢¡£¡×
+¡Ö·Ã¤Þ¤ì¤¿²ÈÄí¤Ë°é¤Ã¤¿¤â¤Î¤Ç¤¹¤«¤é¡£¡×
+
 #N:19:Martti Ihrasaari
 
 N:53:Grip, Farmer Maggot's dog
@@ -1175,3 +1190,4 @@ N:*:Default lines
 ¡Ö»ä¤Ï¿Í¤ò»¦¤¹¤Î¤¬¹¥¤­¤À¡¢¤È¤Æ¤â³Ú¤·¤¤¤«¤é¤Ê¡×
 #screams: 'I'm out to destroy and I will cut you down!'
 ¤Ï¶«¤ó¤À¡§¡Ö»ä¤ÏÇ˲õ¤¹¤ë¤¿¤á¤Ë¸½¤ì¤¿¡¢µ®Íͤò»Â¤ê¼Î¤Æ¤ë¡ª¡×
+

diff --git a/src/defines.h b/src/defines.h
index 18211e7..3f1b9c7 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -149,7 +149,7 @@
 /*
  * Arena constants
  */
-#define MAX_ARENA_MONS         38      /* -KMW- */
+#define MAX_ARENA_MONS         40      /* -KMW- */
 #define ARENA_DEFEATED_OLD_VER (-(MAX_SHORT))
 
 
@@ -4874,6 +4874,7 @@ extern int PlayerUID;
 #define MON_BEGGAR        12
 #define MON_LEPER         13
 #define MON_BLACK_MARKET  14
+#define MON_LION_HEART    19
 #define MON_GHB           39
 #define MON_NOV_PRIEST    45
 #define MON_GRIP          53
@@ -5115,6 +5116,7 @@ extern int PlayerUID;
 #define MON_LOUSY         1063
 #define MON_JIZOTAKO      1065
 #define MON_TANUKI        1067
+#define MON_HATOPOPPO     1083
 
 /* Maximum "Nazguls" number */
 #define MAX_NAZGUL_NUM 5

diff --git a/src/tables.c b/src/tables.c
index 2d20df3..607b797 100644 (file)
--- a/src/tables.c
+++ b/src/tables.c
@@ -1170,6 +1170,7 @@ arena_type arena_info[MAX_ARENA_MONS + 2] =
 {
        { MON_NOBORTA,       0,         0                             },
        { MON_MORI_TROLL,    0,         0                             },
+       { MON_LION_HEART,    0,         0                             },
        { MON_TIGER,         0,         0                             },
        { MON_DRUID,         0,         0                             },
        { MON_HILL_GIANT,    TV_POTION, SV_POTION_SPEED               },