Upgrade Arena. Stronger the monsters, and rewards.

diff --git a/src/bldg.c b/src/bldg.c
index 7317586..7ccb4b5 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -281,7 +281,14 @@ msg_print("
 #else
                                        if (get_check("Do you fight? "))
 #endif
-                                       {
+                                       {       
+#ifdef JP
+                        msg_print("»à¤Ì¤¬¤è¤¤¡£");
+#else
+                                           msg_print("Die, maggots.");
+#endif
+                                               msg_print(NULL);
+                                       
                                                p_ptr->exit_bldg = FALSE;
                                                reset_tim_flags();
 

diff --git a/src/defines.h b/src/defines.h
index 264335e..d6bba84 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -152,7 +152,7 @@
 /*
  * Arena constants
  */
-#define MAX_ARENA_MONS         39      /* -KMW- */
+#define MAX_ARENA_MONS         41      /* -KMW- */
 #define ARENA_DEFEATED_OLD_VER (-(MAX_SHORT))
 
 
@@ -4905,6 +4905,7 @@ extern int PlayerUID;
 #define MON_BLUE_HORROR   189
 #define MON_GOLD_COINS    195
 #define MON_VORPAL_BUNNY  205
+#define MON_MASTER_YEEK   224
 #define MON_PRIEST        225
 #define MON_D_ELF_PRIEST  226
 #define MON_TIGER         230
@@ -4916,9 +4917,13 @@ extern int PlayerUID;
 #define MON_UMBER_HULK    283
 #define MON_ORC_CAPTAIN   285
 #define MON_BERSERKER     293
+#define MON_IMP           296
 #define MON_SHAGRAT       314
 #define MON_GORBAG        315
 #define MON_STONE_GIANT   321
+#define MON_LIZARD_KING   332
+#define MON_WYVERN        334
+#define MON_SABRE_TIGER   339
 #define MON_D_ELF_LORD    348
 #define MON_FIRE_VOR      354
 #define MON_WATER_VOR     355
@@ -4938,6 +4943,7 @@ extern int PlayerUID;
 #define MON_GWAIHIR       410
 #define MON_ANGEL         417
 #define MON_ADAMANT_COINS 423
+#define MON_COLBRAN       435
 #define MON_SPIRIT_NAGA   436
 #define MON_GACHAPIN      441
 #define MON_BASILISK      453
@@ -4947,6 +4953,7 @@ extern int PlayerUID;
 #define MON_SHADOW_DRAKE  471
 #define MON_GHOST         477
 #define MON_OGRE_SHAMAN   479
+#define MON_GHOUL_KING    483
 #define MON_NINJA         485
 #define MON_BICLOPS       490
 #define MON_IVORY_MONK    492
@@ -4973,11 +4980,14 @@ extern int PlayerUID;
 #define MON_MANDOR        598
 #define MON_SHIM_VOR      600
 #define MON_SERAPH        605
+#define MON_BARON_HELL    609
 #define MON_KAVLAX        616
 #define MON_ETTIN         621
 #define MON_VAMPIRE_LORD  623
 #define MON_JUBJUB        640
+#define MON_G_C_DRAKE     646
 #define MON_CLUB_DEMON    648
+#define MON_F_ANGEL       652
 #define MON_D_ELF_SORC    657
 #define MON_MASTER_LICH   658
 #define MON_RINALDO       660
@@ -4987,12 +4997,14 @@ extern int PlayerUID;
 #define MON_JACK_SHADOWS  670
 #define MON_LLOIGOR       682
 #define MON_DREADMASTER   690
+#define MON_DROLEM        691
 #define MON_DAWN          693
 #define MON_NAZGUL        696
 #define MON_SMAUG         697
 #define MON_STORMBRINGER  698
 #define MON_ULTRA_PALADIN 699
 #define MON_G_TITAN       702
+#define MON_S_TYRANNO     705
 #define MON_FAFNER        712
 #define MON_G_BALROG      720
 #define MON_TIME_HOUND    725
@@ -5014,6 +5026,7 @@ extern int PlayerUID;
 #define MON_BRAND         773
 #define MON_SHADOWLORD    774
 #define MON_ARCHLICH      776
+#define MON_JABBERWOCK    778
 #define MON_CHAOS_HOUND   779
 #define MON_ULT_BEHOLDER  781
 #define MON_SHAMBLER      786
@@ -5068,8 +5081,10 @@ extern int PlayerUID;
 #define MON_D_ELF_SHADE   886
 #define MON_MANA_HOUND    887
 #define MON_VENOM_WYRM    890
+#define MON_TROLL_KING    894
 #define MON_BAZOOKER      896
 #define MON_SHARD_VOR     897
+#define MON_ELF_LORD      900
 #define MON_MASTER_MYS    916
 #define MON_G_MASTER_MYS  917
 #define MON_IE            921
@@ -5115,11 +5130,14 @@ extern int PlayerUID;
 #define MON_CHAMELEON     1040
 #define MON_CHAMELEON_K   1041
 #define MON_TOPAZ_MONK    1047
+#define MON_M_MINDCRAFTER 1056
+#define MON_ELDER_VAMPIRE 1058
 #define MON_NOBORTA       1059
 #define MON_MORI_TROLL    1060
 #define MON_BARNEY        1061
 #define MON_GROO          1062
 #define MON_LOUSY         1063
+#define MON_WYRM_SPACE    1064
 #define MON_JIZOTAKO      1065
 #define MON_TANUKI        1067
 #define MON_HATOPOPPO     1083

diff --git a/src/tables.c b/src/tables.c
index ce63503..06bddfa 100644 (file)
--- a/src/tables.c
+++ b/src/tables.c
@@ -1168,45 +1168,47 @@ byte blows_table[12][12] =
 
 arena_type arena_info[MAX_ARENA_MONS + 2] =
 {
-       { MON_NOBORTA,       0,         0                             },
-       { MON_MORI_TROLL,    0,         0                             },
+       { MON_NOBORTA,       TV_AMULET, SV_AMULET_ADORNMENT           },
+       { MON_MORI_TROLL,    TV_FOOD,   SV_FOOD_PINT_OF_WINE          },
+       { MON_IMP,           TV_POTION, SV_POTION_SPEED               },
        { MON_LION_HEART,    0,         0                             },
-       { MON_TIGER,         0,         0                             },
-       { MON_DRUID,         0,         0                             },
-       { MON_HILL_GIANT,    TV_POTION, SV_POTION_SPEED               },
-       { MON_WERERAT,       0,         0                             },
-       { MON_ORC_CAPTAIN,   0,         0                             },
-       { MON_BERSERKER,     0,         0                             },
-       { MON_STONE_GIANT,   0,         0                             },
-       { MON_D_ELF_LORD,    TV_POTION, SV_POTION_HEALING             },
-       { MON_IRON_GOLEM,    0,         0                             },
-       { MON_C_CRAWLER,     0,         0                             },
-       { MON_XICLOTLAN,     0,         0                             },
-       { MON_TROLL_PRIEST,  0,         0                             },
-       { MON_ANGEL,         TV_ROD,    SV_ROD_STONE_TO_MUD           },
-       { MON_SPIRIT_NAGA,   0,         0                             },
-       { MON_BASILISK,      0,         0                             },
-       { MON_MITHRIL_GOLEM, 0,         0                             },
-       { MON_SHADOW_DRAKE,  0,         0                             },
-       { MON_OGRE_SHAMAN,   TV_SCROLL, SV_SCROLL_ACQUIREMENT         },
-       { MON_BICLOPS,       0,         0                             },
-       { MON_ETHER_DRAKE,   TV_SCROLL, SV_SCROLL_RUNE_OF_PROTECTION  },
-       { MON_HALFLING_S,    0,         0                             },
-       { MON_ELDER_THING,   TV_ROD,    SV_ROD_DRAIN_LIFE             },
-       { MON_M_MH_DRAGON,   0,         0                             },
-       { MON_ETTIN,         TV_SCROLL, SV_SCROLL_STAR_ENCHANT_WEAPON },
-       { MON_VAMPIRE_LORD,  0,         0                             },
-       { MON_BARNEY,        TV_SCROLL, SV_SCROLL_GENOCIDE            },
-       { MON_GROO,          0,         0                             },
-       { MON_D_ELF_SORC,    TV_WAND,   SV_WAND_STRIKING              },
-       { MON_IRON_LICH,     0,         0                             },
-       { MON_G_TITAN,       TV_POTION, SV_POTION_STAR_ENLIGHTENMENT  },
-       { MON_G_BALROG,      0,         0                             },
-       { MON_NIGHTWALKER,   TV_ROD,    SV_ROD_IDENTIFY               },
-       { MON_SHAMBLER,      TV_STAFF,  SV_STAFF_HOLINESS             },
-       { MON_BLACK_REAVER,  TV_SCROLL, SV_SCROLL_STAR_ACQUIREMENT    },
+       { MON_MASTER_YEEK,   TV_POTION, SV_POTION_CURING              },
+       { MON_SABRE_TIGER,   TV_WAND,   SV_WAND_STONE_TO_MUD          },
+       { MON_LIZARD_KING,   TV_POTION, SV_POTION_RESISTANCE          },
+       { MON_WYVERN,        TV_POTION, SV_POTION_HEALING             },
+       { MON_ARCH_VILE,     TV_SCROLL, SV_SCROLL_GENOCIDE            },
+       { MON_ELF_LORD   ,   TV_POTION, SV_POTION_ENLIGHTENMENT       },
+       { MON_GHOUL_KING,    TV_FOOD,   SV_FOOD_RESTORING             },
+       { MON_COLBRAN,       TV_RING,   SV_RING_ELEC                  },
+       { MON_BICLOPS,       TV_WAND,   SV_WAND_ACID_BALL             },
+       { MON_M_MINDCRAFTER, TV_POTION, SV_POTION_SELF_KNOWLEDGE      },
+       { MON_GROO,          TV_SCROLL, SV_SCROLL_ACQUIREMENT         },
+       { MON_RAAL,          TV_SCROLL, SV_SCROLL_STAR_DESTRUCTION    },
+       { MON_DREADMASTER,   TV_WAND,   SV_WAND_DRAIN_LIFE            },
+       { MON_ULTRA_PALADIN, TV_STAFF,  SV_STAFF_DISPEL_EVIL          },
+       { MON_BARNEY,        TV_RING,   SV_RING_RES_CHAOS             },
+       { MON_TROLL_KING,    TV_SCROLL, SV_SCROLL_MASS_GENOCIDE       },
+       { MON_BARON_HELL,    TV_POTION, SV_POTION_AUGMENTATION        },
+       { MON_F_ANGEL,       TV_SCROLL, SV_SCROLL_RUNE_OF_PROTECTION  },
+       { MON_G_C_DRAKE,     TV_WAND,   SV_WAND_DRAGON_FIRE           },
+       { MON_IRON_LICH,     TV_STAFF,  SV_STAFF_DESTRUCTION          },
+       { MON_DROLEM,        TV_POTION, SV_POTION_STAR_HEALING        },
+       { MON_G_TITAN,       TV_WAND,   SV_WAND_GENOCIDE              },
+       { MON_G_BALROG,      TV_POTION, SV_POTION_EXPERIENCE          },
+       { MON_ELDER_VAMPIRE, TV_RING,   SV_RING_SUSTAIN               },
+       { MON_NIGHTWALKER,   TV_WAND,   SV_WAND_STRIKING              },
+       { MON_S_TYRANNO,     TV_SCROLL, SV_SCROLL_STAR_ACQUIREMENT    },
+       { MON_G_MASTER_MYS,  TV_ROD,    SV_ROD_IDENTIFY               },
+       { MON_LORD_CHAOS,    TV_POTION, SV_POTION_LIFE                },
+       { MON_SHADOWLORD,    TV_POTION, SV_POTION_STAR_ENLIGHTENMENT  },
+       { MON_ULT_BEHOLDER,  TV_AMULET, SV_AMULET_REFLECTION          },
+       { MON_JABBERWOCK,    TV_ROD,    SV_ROD_HEALING                },
+       { MON_LOCKE_CLONE,   TV_WAND,   SV_WAND_DISINTEGRATE          },
+       { MON_WYRM_SPACE,    TV_ROD,    SV_ROD_RESTORATION            },
+       { MON_SHAMBLER,      TV_SCROLL, SV_SCROLL_STAR_ACQUIREMENT    },
+       { MON_BLACK_REAVER,  TV_RING,   SV_RING_LORDLY                },
        { MON_FENGHUANG,     TV_STAFF,  SV_STAFF_THE_MAGI             },
-       { MON_WYRM_POWER,    TV_ROD,    SV_ROD_HEALING                },
+       { MON_WYRM_POWER,    TV_SCROLL, SV_SCROLL_ARTIFACT            },
        { 0,                 0,         0                             }, /* Victory prizing */
        { MON_HAGURE,        TV_SCROLL, SV_SCROLL_ARTIFACT            },
 };